coze_lab 0.1.40 → 0.1.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coze_lab",
-  "version": "0.1.40",
+  "version": "0.1.41",
   "description": "Configure local AI agents (Claude Code, Codex, OpenClaw) to report traces to CozeLoop",
   "keywords": [
     "cozeloop",

package/scripts/claude-code/cozeloop_hook.py

@@ -1071,7 +1071,7 @@ def _build_history_messages(history_turns: List[Dict[str, Any]]) -> list:
 
 # --- CozeLoop Trace Reporting ---
 
-def send_turns_to_cozeloop(turns: List[Dict[str, Any]], session_id: str, history_turns: Optional[List[Dict[str, Any]]] = None, retry_on_auth_failure: bool = True):
+def send_turns_to_cozeloop(turns: List[Dict[str, Any]], session_id: str, history_turns: Optional[List[Dict[str, Any]]] = None, retry_on_auth_failure: bool = True, coze_tags_override: Optional[Dict[str, str]] = None):
     """Send conversation turns to CozeLoop.
 
     Span hierarchy:
@@ -1160,6 +1160,11 @@ def send_turns_to_cozeloop(turns: List[Dict[str, Any]], session_id: str, history
                 t = coze_context_tags(um.get("content") if um else None)
                 if t:
                     coze_tags = t
+            # 增量上报兜底：本批 turns 不含 <coze-context>（它只在首 turn）时，用 caller
+            # 从 state 传入的 override，保证每个 turn 的 root span 都带 coze_message_id，
+            # 否则后续增量 turn 的 root span 无法按 message_id 查到。
+            if not coze_tags and coze_tags_override:
+                coze_tags = dict(coze_tags_override)
             # Drop empty-valued coze_* tags: the backend pairs traces by exact tag
             # match (coze_message_id / coze_agent_id), where an empty string is
             # indistinguishable from "absent" yet still bloats the span — never
@@ -1604,7 +1609,7 @@ def send_turns_to_cozeloop(turns: List[Dict[str, Any]], session_id: str, history
             if new_token:
                 os.environ["COZELOOP_API_TOKEN"] = new_token
                 hook_log("retry upload once after forced token refresh")
-                return send_turns_to_cozeloop(turns, session_id, history_turns, retry_on_auth_failure=False)
+                return send_turns_to_cozeloop(turns, session_id, history_turns, retry_on_auth_failure=False, coze_tags_override=coze_tags_override)
         return None
 
     return True
@@ -1733,6 +1738,17 @@ def main():
             debug_log("No coze-context found in any turn (incl. history), skipping upload.")
             return
 
+        # 持久化 coze_tags 到 state：<coze-context> 只在首 turn，后续增量批次的 turns 不含它，
+        # 其 root span 会缺 coze_message_id 而无法按 message_id 查到。首次解析到就存 state，
+        # 后续批次作为 override 传给 send_turns，保证每个 turn 的 root span 都带 coze_* tag。
+        for _t in list(turns) + list(history_turns):
+            _um = (_t.get("user_message", {}).get("message", {}) or {})
+            _tags = {k: v for k, v in coze_context_tags(_um.get("content")).items() if isinstance(v, str) and v.strip()}
+            if _tags:
+                state["coze_tags"] = _tags
+                break
+        coze_tags_override = state.get("coze_tags") or None
+
         # turn 边界控制：中途事件(PostToolUse)触发时，最后一个 turn 往往仍在进行中
         # （后续还会追加 step）。若此刻就上报并推进其行号，同一逻辑 turn 会在下次触发时
         # 因缺了起始 user 消息而被拆成新的 root span。故中途事件只上报“已完成”的 turn
@@ -1746,7 +1762,7 @@ def main():
             return
 
         print(f"[CozeLoop] 开始上报: session={session_id}, event={hook_event}, turns={len(turns_to_send)}/{len(turns)}", file=sys.stderr)
-        uploaded = send_turns_to_cozeloop(turns_to_send, session_id, history_turns)
+        uploaded = send_turns_to_cozeloop(turns_to_send, session_id, history_turns, coze_tags_override=coze_tags_override)
         if uploaded is None:
             debug_log("Send failed, state not advanced.")
             return

package/scripts/codex/cozeloop_hook.py

@@ -1077,7 +1077,8 @@ def _make_model_message(role: str, content: str = "", tool_calls: list = None,
 
 def send_turns_to_cozeloop(turns: List[Dict[str, Any]], session_id: str, model_name: str = "codex",
                            history_context: Optional[List[Dict[str, Any]]] = None,
-                           retry_on_auth_failure: bool = True) -> Optional[List[Dict[str, Any]]]:
+                           retry_on_auth_failure: bool = True,
+                           coze_tags_override: Optional[Dict[str, str]] = None) -> Optional[List[Dict[str, Any]]]:
     """Send conversation turns to CozeLoop for tracing.
 
     Span hierarchy:
@@ -1162,6 +1163,11 @@ def send_turns_to_cozeloop(turns: List[Dict[str, Any]], session_id: str, model_n
                 t = {f"coze_{k}": v for k, v in turn_coze_context(turn).items()}
                 if t:
                     coze_tags = t
+            # 增量上报兜底：本批 turns 不含 <coze-context>（它只在首 turn）时，用 caller 从
+            # state 传入的 override，保证每个 turn 的 root span 都带 coze_message_id，否则后续
+            # 增量 turn 的 root span 无法按 message_id 查到。
+            if not coze_tags and coze_tags_override:
+                coze_tags = dict(coze_tags_override)
             # Drop empty-valued coze_* tags: the backend pairs traces by exact tag
             # match (coze_message_id / coze_agent_id), where an empty string is
             # indistinguishable from "absent" yet still bloats the span — never
@@ -1539,6 +1545,7 @@ def send_turns_to_cozeloop(turns: List[Dict[str, Any]], session_id: str, model_n
                     model_name,
                     history_context,
                     retry_on_auth_failure=False,
+                    coze_tags_override=coze_tags_override,
                 )
         return None
 
@@ -1688,6 +1695,17 @@ def main():
         if not seen_ctx:
             state["seen_coze_context"] = True
 
+        # 持久化 coze_tags 到 state：<coze-context> 只在首 turn，后续增量批次不含它，其 root span
+        # 会缺 coze_message_id 无法按 message_id 查到。首次解析到就存 state，后续批次作为 override
+        # 传给 send_turns，保证每个 turn 的 root span 都带 coze_* tag。
+        if not state.get("coze_tags"):
+            for _t in turns:
+                _tags = {f"coze_{k}": v for k, v in turn_coze_context(_t).items() if isinstance(v, str) and v.strip()}
+                if _tags:
+                    state["coze_tags"] = _tags
+                    break
+        coze_tags_override = state.get("coze_tags") or None
+
         # 节流：PostToolUse 在密集工具调用下高频触发。距上次上报不足间隔则跳过本次增量上报。
         # 终态事件(Stop/SubagentStop)永不被节流，保证 turn 结束时一定收尾。
         if not is_terminal_event:
@@ -1714,6 +1732,7 @@ def main():
         updated_history = send_turns_to_cozeloop(
             turns_to_send, session_id, model_name,
             history_context=history_context,
+            coze_tags_override=coze_tags_override,
         )
         if updated_history is not None:
             # 推进 last_processed_line：终态推进到所有 entry 末行；中途保留最后一个未完成 turn，