coze_lab 0.1.46 → 0.1.48

package/package.json

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

package/scripts/claude-code/cozeloop_hook.py

@@ -107,6 +107,36 @@ _OTEL_SUFFIX = "/v1/loop/opentelemetry"
 _DEFAULT_WORKSPACE_ID = "7649231955045072915"  # hardcoded spaceID fallback
 
 
+def _normalize_api_base_url(raw: str) -> str:
+    """Normalize CozeLoop API/OTLP endpoint env vars to the SDK api_base_url."""
+    base = (raw or "").strip().rstrip("/")
+    if not base:
+        return ""
+    suffixes = [
+        "/api/v1/loop/traces/ingest",
+        "/v1/loop/traces/ingest",
+        "/api/v1/loop/opentelemetry/v1/traces",
+        "/v1/loop/opentelemetry/v1/traces",
+        "/api/v1/loop/opentelemetry",
+        "/v1/loop/opentelemetry",
+        "/api/v1",
+        "/v1",
+    ]
+    for suffix in suffixes:
+        if base.endswith(suffix):
+            return base[:-len(suffix)].rstrip("/")
+    return base
+
+
+def get_api_base_url() -> str:
+    """Return optional CozeLoop SDK api_base_url from onboard-injected env."""
+    return _normalize_api_base_url(
+        os.environ.get("COZELOOP_API_BASE_URL")
+        or os.environ.get("OTEL_ENDPOINT")
+        or ""
+    )
+
+
 # --- coze-context parsing -------------------------------------------------
 # User messages may embed a block like:
 #   <coze-context>
@@ -1442,7 +1472,12 @@ def send_steps_realtime(turns, session_id, history_turns, state, coze_tags_overr
     if token:
         os.environ["COZELOOP_API_TOKEN"] = token
     workspace_id = os.environ.get("COZELOOP_WORKSPACE_ID", "") or _DEFAULT_WORKSPACE_ID
-    client_kwargs = {"ultra_large_report": True, "upload_timeout": 120}
+    upload_events: List[str] = []
+    client_kwargs = {
+        "ultra_large_report": True,
+        "upload_timeout": 120,
+        "trace_finish_event_processor": _make_finish_event_processor(upload_events),
+    }
     if workspace_id:
         client_kwargs["workspace_id"] = workspace_id
     if token:
@@ -1509,6 +1544,9 @@ def send_steps_realtime(turns, session_id, history_turns, state, coze_tags_overr
             # 实测：root finish 后，子 span 仍可用其 header 挂到同一 trace_id 下，不影响后续增量。
             root_span.finish()
             client.flush()
+            if upload_events:
+                debug_log(f"[rt] upload failed after root flush: {upload_events[-1][:500]}")
+                return None
             debug_log(f"[rt] root created+finished trace_id={getattr(root_ctx,'trace_id','?')}")
 
         # ---- 发新完成的 step ----
@@ -1592,6 +1630,9 @@ def send_steps_realtime(turns, session_id, history_turns, state, coze_tags_overr
             sent += 1
             # 每个 step 立即 flush —— 这是“结束即可见”的关键。
             client.flush()
+            if upload_events:
+                debug_log(f"[rt] upload failed after step flush: {upload_events[-1][:500]}")
+                return None
 
         new_last = last_global + sent
         state["rt_last_global_step"] = new_last
@@ -1620,8 +1661,15 @@ def send_steps_realtime(turns, session_id, history_turns, state, coze_tags_overr
                 fin.set_output(last_output)
                 fin.finish()
             client.flush()
+            if upload_events:
+                debug_log(f"[rt] upload failed after final flush: {upload_events[-1][:500]}")
+                return None
             debug_log(f"[rt] finalized, total sent steps={new_last}")
 
+        if upload_events:
+            debug_log(f"[rt] upload failed, state not advanced. Last failure: {upload_events[-1][:500]}")
+            return None
+
         debug_log(f"[rt] sent {sent} new step(s), last_global={new_last}/{total_steps}, terminal={is_terminal}")
         return True
     except Exception as e:

package/scripts/codex/cozeloop_hook.py

@@ -133,6 +133,36 @@ else:
 DEBUG = os.environ.get("CC_COZELOOP_DEBUG", "").lower() == "true"
 
 
+def _normalize_api_base_url(raw: str) -> str:
+    """Normalize CozeLoop API/OTLP endpoint env vars to the SDK api_base_url."""
+    base = (raw or "").strip().rstrip("/")
+    if not base:
+        return ""
+    suffixes = [
+        "/api/v1/loop/traces/ingest",
+        "/v1/loop/traces/ingest",
+        "/api/v1/loop/opentelemetry/v1/traces",
+        "/v1/loop/opentelemetry/v1/traces",
+        "/api/v1/loop/opentelemetry",
+        "/v1/loop/opentelemetry",
+        "/api/v1",
+        "/v1",
+    ]
+    for suffix in suffixes:
+        if base.endswith(suffix):
+            return base[:-len(suffix)].rstrip("/")
+    return base
+
+
+def get_api_base_url() -> str:
+    """Return optional CozeLoop SDK api_base_url from onboard-injected env."""
+    return _normalize_api_base_url(
+        os.environ.get("COZELOOP_API_BASE_URL")
+        or os.environ.get("OTEL_ENDPOINT")
+        or ""
+    )
+
+
 def _log_file_path() -> str:
     return os.environ.get("COZELOOP_HOOK_LOG", "").strip()
 
@@ -1221,7 +1251,12 @@ def send_steps_realtime(turns, session_id, state, model_name="codex", coze_tags_
     if token:
         os.environ["COZELOOP_API_TOKEN"] = token
     workspace_id = os.environ.get("COZELOOP_WORKSPACE_ID", "") or _DEFAULT_WORKSPACE_ID
-    client_kwargs = {"ultra_large_report": True, "upload_timeout": 120}
+    upload_events: List[str] = []
+    client_kwargs = {
+        "ultra_large_report": True,
+        "upload_timeout": 120,
+        "trace_finish_event_processor": _make_finish_event_processor(upload_events),
+    }
     if workspace_id:
         client_kwargs["workspace_id"] = workspace_id
     if token:
@@ -1277,6 +1312,9 @@ def send_steps_realtime(turns, session_id, state, model_name="codex", coze_tags_
             root_ctx = client.get_span_from_header(state["rt_root_header"])
             root_span.finish()  # 立即 finish 落库（后端按 root_span 查），子 span 仍可挂同 trace
             client.flush()
+            if upload_events:
+                hook_log(f"[rt] upload failed after root flush detail={upload_events[-1][:500]}")
+                return None
             hook_log(f"[rt] root created trace_id={getattr(root_ctx,'trace_id','?')}")
 
         # 线性展开所有 tool_call（带 result 的才算完成），按全局序增量发
@@ -1331,6 +1369,9 @@ def send_steps_realtime(turns, session_id, state, model_name="codex", coze_tags_
             tspan.finish()
             sent += 1
             client.flush()  # 每个 tool_call 立即 flush → 结束即可见
+            if upload_events:
+                hook_log(f"[rt] upload failed after tool flush detail={upload_events[-1][:500]}")
+                return None
 
         state["rt_last_tool"] = last_tool + sent
         if sent > 0:
@@ -1352,8 +1393,15 @@ def send_steps_realtime(turns, session_id, state, model_name="codex", coze_tags_
                 fin.set_output(truncate_text(last_out))
                 fin.finish()
             client.flush()
+            if upload_events:
+                hook_log(f"[rt] upload failed after final flush detail={upload_events[-1][:500]}")
+                return None
             hook_log(f"[rt] finalized total_tools={state['rt_last_tool']}")
 
+        if upload_events:
+            hook_log(f"[rt] upload failed state not advanced detail={upload_events[-1][:500]}")
+            return None
+
         hook_log(f"[rt] sent {sent} tool span(s), last_tool={state['rt_last_tool']}, terminal={is_terminal}")
         return True
     except Exception as e: