power-loop 6.48.0__tar.gz → 6.49.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {power_loop-6.48.0 → power_loop-6.49.0}/PKG-INFO +1 -1
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/__init__.py +1 -1
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/core/pipeline.py +8 -4
- power_loop-6.49.0/power_loop/runtime/background.py +42 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/representation.py +1 -1
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/runtime_state.py +25 -3
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/tools/default_tools.py +44 -6
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/workflow/engine.py +43 -2
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/workflow/journal.py +4 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop.egg-info/PKG-INFO +1 -1
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop.egg-info/SOURCES.txt +1 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/LICENSE +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/README.md +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/_vendor/__init__.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/_vendor/llm_client/__init__.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/_vendor/llm_client/anthropic_factory.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/_vendor/llm_client/capabilities.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/_vendor/llm_client/interface.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/_vendor/llm_client/llm_factory.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/_vendor/llm_client/llm_tooling.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/_vendor/llm_client/llm_utils.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/_vendor/llm_client/multimodal.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/_vendor/llm_client/proxy_fallback.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/agent/__init__.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/agent/follow_up.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/agent/sink.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/agent/stateful_loop.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/agent/system_prompt.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/agent/types.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contracts/__init__.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contracts/errors.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contracts/event_payloads.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contracts/events.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contracts/handlers.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contracts/hook_contexts.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contracts/hooks.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contracts/messages.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contracts/protocols.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contracts/tools.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contrib/__init__.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contrib/_redact.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contrib/jsonl_sink.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contrib/logging_sink.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contrib/mcp.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contrib/metrics_sink.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/contrib/otel_sink.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/core/agent_context.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/core/events.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/core/hooks.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/core/phase.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/core/runner.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/core/state.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/py.typed +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/blackboard.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/budget.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/cancellation.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/capability_probe.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/compact.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/env.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/exec_backend.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/fold.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/fold_adapter.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/history_projector.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/history_sanitize.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/human_input.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/image_recall.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/memory.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/notes.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/provider.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/retry.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/session_store.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/skills.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/spec.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/steer.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/stop_policy.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/store/__init__.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/store/backends/__init__.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/store/backends/mysql.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/store/backends/postgres.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/store/backends/sqlite.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/store/capabilities.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/store/db.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/store/dialect.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/store/factory.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/store/schema.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/store/store.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/store/types.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/structured.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/stub_provider.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/timers.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/todos.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/runtime/usage_estimate.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/tools/__init__.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/tools/blackboard.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/tools/command_policy.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/tools/command_rules.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/tools/default_manifest.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/tools/registry.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/tools/spawn_agent.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/workflow/__init__.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/workflow/api.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/workflow/introspect.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/workflow/result.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/workflow/resume.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/workflow/runner.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/workflow/spec.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/workflow/subprocess_executor.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/workflow/tool.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop/workflow/worker.py +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop.egg-info/dependency_links.txt +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop.egg-info/requires.txt +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/power_loop.egg-info/top_level.txt +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/pyproject.toml +0 -0
- {power_loop-6.48.0 → power_loop-6.49.0}/setup.cfg +0 -0
|
@@ -15,7 +15,7 @@ Stability tiers
|
|
|
15
15
|
无版本承诺,可随时变更或删除。
|
|
16
16
|
"""
|
|
17
17
|
|
|
18
|
-
__version__ = "6.
|
|
18
|
+
__version__ = "6.49.0"
|
|
19
19
|
|
|
20
20
|
# Public LLM contract (SDK-free) re-exported so callers (e.g. writing llm.* hooks or
|
|
21
21
|
# a custom LLMService) don't reach into the internal vendored transport package (H3.4).
|
|
@@ -1128,9 +1128,9 @@ class AgentPipeline:
|
|
|
1128
1128
|
async def _runtime_messages_for_round(self, round_index: int) -> list[LoopMessage]:
|
|
1129
1129
|
"""Build transient runtime-state messages for the next LLM call.
|
|
1130
1130
|
|
|
1131
|
-
|
|
1132
|
-
|
|
1133
|
-
|
|
1131
|
+
Current state projections are ephemeral. Completed background tool results
|
|
1132
|
+
opt into durable history with ``_persist`` so later sends retain their
|
|
1133
|
+
original-tool summary after the notification is acknowledged.
|
|
1134
1134
|
"""
|
|
1135
1135
|
if self.store is None or self.session_id is None:
|
|
1136
1136
|
todo_snap = self.ctx.todo.snapshot_for_prompt()
|
|
@@ -1153,7 +1153,11 @@ class AgentPipeline:
|
|
|
1153
1153
|
ack = m.pop("_ack", None)
|
|
1154
1154
|
if ack is not None and hasattr(projector, "acknowledge"):
|
|
1155
1155
|
self._pending_acks.append((projector, ack))
|
|
1156
|
-
|
|
1156
|
+
if m.pop("_persist", False):
|
|
1157
|
+
if not any(_persist_key(old) == _persist_key(m) for old in self.history):
|
|
1158
|
+
await self._append_message(m, round_index=round_index)
|
|
1159
|
+
else:
|
|
1160
|
+
messages.append(m)
|
|
1157
1161
|
return messages
|
|
1158
1162
|
|
|
1159
1163
|
async def _acknowledge_runtime(self) -> None:
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"""Durable identity and results of background tool calls; no schema migration needed."""
|
|
2
|
+
from __future__ import annotations
|
|
3
|
+
|
|
4
|
+
import json
|
|
5
|
+
from typing import Any
|
|
6
|
+
|
|
7
|
+
ACTIVE_STATUSES = frozenset({'queued', 'pending', 'running'})
|
|
8
|
+
RESULT_PREFIX = '[background_tool_results]\n'
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
def record_key(task_id: str) -> str:
|
|
12
|
+
return 'background_tool:' + task_id
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
def encode_results(tasks: list[dict[str, Any]]) -> str:
|
|
16
|
+
return RESULT_PREFIX + json.dumps({'version': 1, 'tasks': tasks}, ensure_ascii=False)
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
async def load_record(store: Any, sid: str | None, task_id: str) -> dict[str, Any] | None:
|
|
20
|
+
if store is None or sid is None or not hasattr(store, 'get_runtime_state'):
|
|
21
|
+
return None
|
|
22
|
+
value = await store.get_runtime_state(sid, record_key(task_id), default=None)
|
|
23
|
+
return value if isinstance(value, dict) else None
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
def summarize_record(record: dict[str, Any]) -> dict[str, Any]:
|
|
27
|
+
from power_loop.core.agent_context import get_current_loop
|
|
28
|
+
|
|
29
|
+
loop = get_current_loop()
|
|
30
|
+
config = getattr(loop, 'config', None)
|
|
31
|
+
rep = getattr(config, 'representation', None)
|
|
32
|
+
distill = getattr(rep, 'distill_tool_call', None)
|
|
33
|
+
result = str(record.get('result') or '')
|
|
34
|
+
summary = result[:750]
|
|
35
|
+
if callable(distill):
|
|
36
|
+
try:
|
|
37
|
+
summary = distill(record['tool'], record.get('args') or {}, result,
|
|
38
|
+
getattr(loop, 'tool_registry', None))
|
|
39
|
+
except Exception:
|
|
40
|
+
# The canonical result stays available even if a host distiller fails.
|
|
41
|
+
pass
|
|
42
|
+
return {k: record.get(k) for k in ('task_id', 'tool', 'status', 'result_ref')} | {'summary': summary}
|
|
@@ -363,7 +363,7 @@ class ProjectedRepresentation:
|
|
|
363
363
|
seen_assistant = False
|
|
364
364
|
for r in send_rows:
|
|
365
365
|
if r.role == "user":
|
|
366
|
-
if seen_assistant:
|
|
366
|
+
if seen_assistant or getattr(r, "name", None) == "background_tool_results":
|
|
367
367
|
# Verbatim like the input (conversation content, not tool output).
|
|
368
368
|
tools.append({
|
|
369
369
|
"name": "__user__",
|
|
@@ -107,8 +107,30 @@ class BackgroundRuntimeProjector(RuntimeProjector):
|
|
|
107
107
|
updates = await store.list_unseen_background_updates(session_id)
|
|
108
108
|
if not updates:
|
|
109
109
|
return []
|
|
110
|
-
|
|
110
|
+
from power_loop.runtime.background import ACTIVE_STATUSES, encode_results, load_record, summarize_record
|
|
111
|
+
durable = []
|
|
112
|
+
legacy = []
|
|
111
113
|
for task in updates:
|
|
114
|
+
record = await load_record(store, session_id, task.task_id)
|
|
115
|
+
if record is not None and task.status not in ACTIVE_STATUSES:
|
|
116
|
+
if "result" not in record:
|
|
117
|
+
record = {**record, "result": "(完整结果未保存,以下为台账预览)\n" + (task.output_tail or "")}
|
|
118
|
+
durable.append(summarize_record({**record, "status": task.status}))
|
|
119
|
+
else:
|
|
120
|
+
legacy.append(task)
|
|
121
|
+
messages = []
|
|
122
|
+
for record in durable:
|
|
123
|
+
# Stable per-task messages remain deduplicable if another task finishes
|
|
124
|
+
# between a failed model request and its retry.
|
|
125
|
+
message = {"role": "user", "name": "background_tool_results",
|
|
126
|
+
"content": encode_results([record]), "_persist": True}
|
|
127
|
+
if self.mark_seen:
|
|
128
|
+
message["_ack"] = ("background_seen", [record["task_id"]])
|
|
129
|
+
messages.append(message)
|
|
130
|
+
if not legacy:
|
|
131
|
+
return messages
|
|
132
|
+
chunks: list[str] = ["<background_updates>"]
|
|
133
|
+
for task in legacy:
|
|
112
134
|
output = (task.output_tail or "(running)").strip()
|
|
113
135
|
chunks.append(
|
|
114
136
|
"\n".join(
|
|
@@ -132,8 +154,8 @@ class BackgroundRuntimeProjector(RuntimeProjector):
|
|
|
132
154
|
# succeeded. The pipeline strips this private marker before the request and calls
|
|
133
155
|
# :meth:`acknowledge` only after a successful call — a failed / degraded / aborted
|
|
134
156
|
# call must not swallow the updates (design/124 Z7).
|
|
135
|
-
msg["_ack"] = ("background_seen", [task.task_id for task in
|
|
136
|
-
return [msg]
|
|
157
|
+
msg["_ack"] = ("background_seen", [task.task_id for task in legacy])
|
|
158
|
+
return [*messages, msg]
|
|
137
159
|
|
|
138
160
|
async def acknowledge(self, *, store: Any, session_id: str, ack: Any) -> None:
|
|
139
161
|
"""Mark the projected tasks seen — called by the pipeline once the model saw them."""
|
|
@@ -1583,13 +1583,17 @@ class BackgroundManager:
|
|
|
1583
1583
|
task_id = str(uuid.uuid4())[:8]
|
|
1584
1584
|
args = dict(args or {})
|
|
1585
1585
|
label = f"tool:{name} " + json.dumps(args, ensure_ascii=False)[:160]
|
|
1586
|
+
record = {"task_id": task_id, "tool": name, "args": args, "status": "queued",
|
|
1587
|
+
"result_ref": "background_tool:" + task_id}
|
|
1588
|
+
if store is not None and sid is not None and hasattr(store, "set_runtime_state"):
|
|
1589
|
+
await store.set_runtime_state(sid, record["result_ref"], record)
|
|
1586
1590
|
if store is not None and sid is not None:
|
|
1587
1591
|
await store.upsert_background_task(
|
|
1588
1592
|
sid, task_id=task_id, command=label, status="queued",
|
|
1589
1593
|
return_code=None, output_tail="(queued)",
|
|
1590
1594
|
)
|
|
1591
1595
|
with self._lock:
|
|
1592
|
-
self.tasks[task_id] = {"command": label, "status": "queued", "result": None}
|
|
1596
|
+
self.tasks[task_id] = {"command": label, "status": "queued", "result": None, "tool_record": record}
|
|
1593
1597
|
# One FIFO admission gate per store/session/event loop. No await between lookup
|
|
1594
1598
|
# and registration: concurrent submissions cannot oversubscribe the limit.
|
|
1595
1599
|
key = (asyncio.get_running_loop(), id(store), sid)
|
|
@@ -1666,14 +1670,15 @@ class BackgroundManager:
|
|
|
1666
1670
|
status = "failed"
|
|
1667
1671
|
else:
|
|
1668
1672
|
output = str(result if result is not None else "")
|
|
1669
|
-
|
|
1673
|
+
if output.lstrip().lower().startswith("error:"):
|
|
1674
|
+
status = "failed"
|
|
1670
1675
|
except asyncio.CancelledError:
|
|
1671
1676
|
status, output = "cancelled", "(cancelled)"
|
|
1672
1677
|
await self._settle(task_id, label, store, sid, status, output, notify=False)
|
|
1673
1678
|
raise
|
|
1674
1679
|
except Exception as exc: # noqa: BLE001 — 失败是任务结果,不是崩溃
|
|
1675
1680
|
status = "failed"
|
|
1676
|
-
output = f"{type(exc).__name__}: {exc}"
|
|
1681
|
+
output = f"{type(exc).__name__}: {exc}"
|
|
1677
1682
|
await self._settle(task_id, label, store, sid, status, output, notify=True)
|
|
1678
1683
|
|
|
1679
1684
|
task = asyncio.ensure_future(_worker())
|
|
@@ -1693,12 +1698,21 @@ class BackgroundManager:
|
|
|
1693
1698
|
if task is not None:
|
|
1694
1699
|
task["status"] = status
|
|
1695
1700
|
task["result"] = output or "(no output)"
|
|
1701
|
+
record = (task or {}).get("tool_record")
|
|
1702
|
+
if record is not None and task is not None:
|
|
1703
|
+
record = {**record, "status": status, "result": output}
|
|
1704
|
+
task["tool_record"] = record
|
|
1705
|
+
if store is not None and sid is not None and hasattr(store, "set_runtime_state"):
|
|
1706
|
+
try:
|
|
1707
|
+
await store.set_runtime_state(sid, record["result_ref"], record)
|
|
1708
|
+
except Exception: # noqa: BLE001 — still settle the task and notify the host
|
|
1709
|
+
logger.warning("tool task %s: full result write-back failed", task_id, exc_info=True)
|
|
1696
1710
|
if store is not None and sid is not None:
|
|
1697
1711
|
try:
|
|
1698
1712
|
await store.upsert_background_task(
|
|
1699
1713
|
sid, task_id=task_id, command=label, status=status,
|
|
1700
1714
|
return_code=0 if status == "completed" else 1,
|
|
1701
|
-
output_tail=output or "(no output)",
|
|
1715
|
+
output_tail=output[:8000] or "(no output)",
|
|
1702
1716
|
)
|
|
1703
1717
|
except Exception: # noqa: BLE001
|
|
1704
1718
|
logger.warning("tool task %s: status write-back failed", task_id, exc_info=True)
|
|
@@ -1721,8 +1735,12 @@ class BackgroundManager:
|
|
|
1721
1735
|
store, sid = _current_store_and_session()
|
|
1722
1736
|
task_id = str(uuid.uuid4())[:8]
|
|
1723
1737
|
label = f"tool:{tool_name} " + json.dumps(dict(args or {}), ensure_ascii=False)[:160]
|
|
1738
|
+
record = {"task_id": task_id, "tool": tool_name, "args": dict(args or {}),
|
|
1739
|
+
"status": "running", "result_ref": "background_tool:" + task_id}
|
|
1740
|
+
if store is not None and sid is not None and hasattr(store, "set_runtime_state"):
|
|
1741
|
+
await store.set_runtime_state(sid, record["result_ref"], record)
|
|
1724
1742
|
with self._lock:
|
|
1725
|
-
self.tasks[task_id] = {"command": label, "status": "running", "result": None}
|
|
1743
|
+
self.tasks[task_id] = {"command": label, "status": "running", "result": None, "tool_record": record}
|
|
1726
1744
|
if store is not None and sid is not None:
|
|
1727
1745
|
await store.upsert_background_task(
|
|
1728
1746
|
sid, task_id=task_id, command=label, status="running",
|
|
@@ -1788,6 +1806,19 @@ class BackgroundManager:
|
|
|
1788
1806
|
await asyncio.wait({worker}, timeout=5)
|
|
1789
1807
|
return "forced"
|
|
1790
1808
|
|
|
1809
|
+
async def _tool_result(self, store: Any, sid: str | None, task_id: str) -> dict[str, Any] | None:
|
|
1810
|
+
from power_loop.runtime.background import load_record
|
|
1811
|
+
record = await load_record(store, sid, task_id)
|
|
1812
|
+
memory_record = self.tasks.get(task_id, {}).get("tool_record")
|
|
1813
|
+
if record is None or ("result" not in record and memory_record and "result" in memory_record):
|
|
1814
|
+
record = memory_record
|
|
1815
|
+
if record is not None:
|
|
1816
|
+
status, tail = await self._status_of(store, sid, task_id)
|
|
1817
|
+
if status not in ("queued", "pending", "running") and "result" not in record:
|
|
1818
|
+
record = {**record, "result": tail, "legacy": True}
|
|
1819
|
+
return {**record, "status": status}
|
|
1820
|
+
return None
|
|
1821
|
+
|
|
1791
1822
|
async def _status_of(self, store: Any, sid: str | None, task_id: str) -> tuple[str, str]:
|
|
1792
1823
|
"""(status, 输出尾巴):优先读 store 里这个会话的行,没有就读进程内记录。"""
|
|
1793
1824
|
if store is not None and sid is not None:
|
|
@@ -1841,10 +1872,17 @@ class BackgroundManager:
|
|
|
1841
1872
|
head = ("等的时候来了新消息,先停下来等(任务照常在跑)。" if steered
|
|
1842
1873
|
else f"还有 {pending} 件没做完(等了 {int(timeout_s)} 秒,任务照常在跑)。" if pending
|
|
1843
1874
|
else "都做完了。")
|
|
1844
|
-
|
|
1875
|
+
from power_loop.runtime.background import encode_results
|
|
1876
|
+
records = [r for tid in ids if (r := await self._tool_result(store, sid, tid)) is not None]
|
|
1877
|
+
return head + "\n" + "\n".join(lines) + ("\n" + encode_results(records) if records else "")
|
|
1845
1878
|
|
|
1846
1879
|
async def check(self, task_id: str | None = None) -> str:
|
|
1847
1880
|
store, sid = _current_store_and_session()
|
|
1881
|
+
if task_id:
|
|
1882
|
+
record = await self._tool_result(store, sid, task_id)
|
|
1883
|
+
if record is not None:
|
|
1884
|
+
from power_loop.runtime.background import encode_results
|
|
1885
|
+
return f"[{record['status']}] {record['tool']}\n" + encode_results([record])
|
|
1848
1886
|
if store is not None and sid is not None:
|
|
1849
1887
|
# Recover any terminal status a daemon thread couldn't deliver to a now-gone
|
|
1850
1888
|
# loop, so a stuck 'running' row self-heals on the next read.
|
|
@@ -122,6 +122,8 @@ def _loop_prompt(lc: dict[str, Any], user_input: str) -> str:
|
|
|
122
122
|
return (f"第 {lc['iteration']}/{lc['max']} 轮:上一轮没通过({lc.get('why') or ''})。\n"
|
|
123
123
|
f"上一轮的意见:\n{lc.get('feedback') or ''}\n\n"
|
|
124
124
|
"按意见改。你上一轮做的都还在(会话、文件),在已有成果上改,不要从头重做。改完照原来的要求交卷。\n\n"
|
|
125
|
+
"先用 todo 列出本轮审核意见对应的修复与复验任务;上一轮已完成待办只代表历史成果。"
|
|
126
|
+
"完成待办后还需提交本轮最终结果;若审核缺少具体问题,先读取审核报告核实。\n\n"
|
|
125
127
|
f"(这一轮的任务输入照旧附在下面)\n{user_input}")
|
|
126
128
|
|
|
127
129
|
|
|
@@ -802,6 +804,7 @@ class WorkflowEngine:
|
|
|
802
804
|
and lc["prev"].get(node.id)):
|
|
803
805
|
prev_sid = lc["prev"][node.id]
|
|
804
806
|
try:
|
|
807
|
+
await self._prepare_rework(prev_sid, node.id, lc)
|
|
805
808
|
resumed_raw = await self._continue_leaf(
|
|
806
809
|
prev_sid, _loop_prompt(lc, user_input), extra_rounds=max(int(node.spec.max_rounds or 30), 10), stop=node_tok)
|
|
807
810
|
resumed_raw.setdefault("session_id", prev_sid)
|
|
@@ -1037,6 +1040,27 @@ class WorkflowEngine:
|
|
|
1037
1040
|
except Exception: # noqa: BLE001
|
|
1038
1041
|
return []
|
|
1039
1042
|
|
|
1043
|
+
async def _prepare_rework(self, session_id: str, node_id: str, lc: dict[str, Any]) -> None:
|
|
1044
|
+
"""Archive the previous todo only for a new review iteration, never for a budget continuation."""
|
|
1045
|
+
from power_loop.runtime.todos import render_todos, todo_counts, validate_todos
|
|
1046
|
+
|
|
1047
|
+
if not hasattr(self._loop, "ensure_store"):
|
|
1048
|
+
return
|
|
1049
|
+
store = await self._loop.ensure_store()
|
|
1050
|
+
key = f"workflow_rework:{lc['loop_id']}:{node_id}:{lc['iteration']}"
|
|
1051
|
+
if await store.get_runtime_state(session_id, key, default=None):
|
|
1052
|
+
return
|
|
1053
|
+
old = await store.get_runtime_state(session_id, "todo", default={})
|
|
1054
|
+
await store.set_runtime_state(session_id, key + ":previous_todo", old)
|
|
1055
|
+
items = validate_todos([{"text": f"第 {lc['iteration']} 轮:核实审核意见,列出修复与复验任务", "status": "in_progress"}])
|
|
1056
|
+
await store.set_runtime_state(session_id, "todo", {
|
|
1057
|
+
"items": items, "rendered": render_todos(items), "counts": todo_counts(items),
|
|
1058
|
+
})
|
|
1059
|
+
state = {"iteration": lc["iteration"], "node_id": node_id, "loop_id": lc["loop_id"],
|
|
1060
|
+
"reason": lc.get("why"), "previous_todo_ref": key + ":previous_todo"}
|
|
1061
|
+
await store.set_runtime_state(session_id, "workflow_rework", state)
|
|
1062
|
+
await store.set_runtime_state(session_id, key, state)
|
|
1063
|
+
|
|
1040
1064
|
async def _continue_leaf(self, session_id: str, prompt: str, *, extra_rounds: int,
|
|
1041
1065
|
stop: CancellationToken | None = None) -> dict[str, Any]:
|
|
1042
1066
|
"""原会话补轮。走 executor 的 ``continue_agent``(host 可换实现,如加自己的 guards);
|
|
@@ -1044,8 +1068,25 @@ class WorkflowEngine:
|
|
|
1044
1068
|
fn = getattr(self._executor, "continue_agent", None)
|
|
1045
1069
|
if fn is None:
|
|
1046
1070
|
fn = InProcessExecutor().continue_agent
|
|
1047
|
-
|
|
1048
|
-
|
|
1071
|
+
from power_loop.contracts.event_payloads import SubagentCompletedPayload, SubagentTaskStartPayload
|
|
1072
|
+
from power_loop.contracts.events import AgentEventType
|
|
1073
|
+
from power_loop.core.agent_context import get_session_id
|
|
1074
|
+
from power_loop.runtime.spec import _publish_subagent_event
|
|
1075
|
+
|
|
1076
|
+
parent_sid = get_session_id()
|
|
1077
|
+
_publish_subagent_event(self._loop, parent_sid, AgentEventType.SUBAGENT_TASK_START,
|
|
1078
|
+
SubagentTaskStartPayload(task=prompt, preset="core", sub_session_id=session_id, depth=1))
|
|
1079
|
+
result = None
|
|
1080
|
+
try:
|
|
1081
|
+
result = await fn(session_id, prompt, parent_loop=self._loop,
|
|
1082
|
+
extra_rounds=extra_rounds, stop_event=stop or self._cancel)
|
|
1083
|
+
return result
|
|
1084
|
+
finally:
|
|
1085
|
+
_publish_subagent_event(self._loop, parent_sid, AgentEventType.SUBAGENT_COMPLETED,
|
|
1086
|
+
SubagentCompletedPayload(sub_session_id=session_id,
|
|
1087
|
+
status=(result or {}).get("status", "failed"),
|
|
1088
|
+
rounds=int((result or {}).get("rounds") or 0),
|
|
1089
|
+
final_text=str((result or {}).get("final_text") or "")))
|
|
1049
1090
|
|
|
1050
1091
|
@staticmethod
|
|
1051
1092
|
def _should_retry(raw: dict[str, Any], triggers: set[str]) -> bool:
|
|
@@ -181,6 +181,10 @@ async def node_start(
|
|
|
181
181
|
if jn is None or _is_terminal(jn.get("status")):
|
|
182
182
|
return MUTATE_SKIP
|
|
183
183
|
live = dict(jn.get("live") or {})
|
|
184
|
+
if node_id not in live:
|
|
185
|
+
attempts = dict(jn.get("node_attempts") or {})
|
|
186
|
+
attempts[node_id] = int(attempts.get(node_id) or 0) + 1
|
|
187
|
+
jn["node_attempts"] = attempts
|
|
184
188
|
live[node_id] = _now_ms()
|
|
185
189
|
jn["live"] = live
|
|
186
190
|
jn["updated_at_ms"] = _now_ms()
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|