oh-langfuse 0.1.41 → 0.1.43

package/README.md

@@ -1,20 +1,12 @@
-# oh-langfuse
+# oh-langfuse
 
-`oh-langfuse` 是用于给 Claude Code、OpenCode 和 Codex 配置 Langfuse 追踪的命令行工具。它提供交互式安装向导，也支持 `setup` / `check` 直接命令，方便在用户机器上安装、修复和校验配置。
+`oh-langfuse` 鏄敤浜庣粰 Claude Code銆丱penCode 鍜?Codex 閰嶇疆 Langfuse 杩借釜鐨勫懡浠よ宸ュ叿銆傚畠鎻愪緵浜や簰寮忓畨瑁呭悜瀵硷紝涔熸敮鎸?`setup` / `check` 鐩存帴鍛戒护锛屾柟渚垮湪鐢ㄦ埛鏈哄櫒涓婂畨瑁呫€佷慨澶嶅拰鏍￠獙閰嶇疆銆?
+褰撳墠 npm 鐗堟湰锛歚0.1.41`
 
-当前 npm 版本：`0.1.41`
-
-## 能做什么
-
-- 给 Claude Code 安装 `Stop` hook，把会话事件写入 Langfuse。
-- 给 OpenCode 安装并 patch `opencode-plugin-langfuse`，开启 OpenTelemetry。
-- 给 Codex 安装 `notify` hook，增量读取 session JSONL 并写入 Langfuse。
-- 安装完成后自动执行对应 `check`，尽早发现配置缺失。
-- 校验员工号格式，必须匹配 `^[a-z](?:\d{8}|wx\d{7})$`，例如 `h00613222` 或 `hwx1234567`。
-
-## 快速使用
-
-建议始终带 `@latest`，避免 npx 使用本地旧缓存：
+## 鑳藉仛浠€涔?
+- 缁?Claude Code 瀹夎 `Stop` hook锛屾妸浼氳瘽浜嬩欢鍐欏叆 Langfuse銆?- 缁?OpenCode 瀹夎骞?patch `opencode-plugin-langfuse`锛屽紑鍚?OpenTelemetry銆?- 缁?Codex 瀹夎 `notify` hook锛屽閲忚鍙?session JSONL 骞跺啓鍏?Langfuse銆?- 瀹夎瀹屾垚鍚庤嚜鍔ㄦ墽琛屽搴?`check`锛屽敖鏃╁彂鐜伴厤缃己澶便€?- 鏍￠獙鍛樺伐鍙锋牸寮忥紝蹇呴』鍖归厤 `^[a-z](?:\d{8}|wx\d{7})$`锛屼緥濡?`h00613222` 鎴?`hwx1234567`銆?
+## 蹇€熶娇鐢?
+寤鸿濮嬬粓甯?`@latest`锛岄伩鍏?npx 浣跨敤鏈湴鏃х紦瀛橈細
 
 ```bash
 npx oh-langfuse@latest
@@ -22,7 +14,7 @@ npx oh-langfuse@latest setup
 npx oh-langfuse@latest check
 ```
 
-也可以指定目标：
+涔熷彲浠ユ寚瀹氱洰鏍囷細
 
 ```bash
 npx oh-langfuse@latest setup claude
@@ -34,19 +26,15 @@ npx oh-langfuse@latest check opencode
 npx oh-langfuse@latest check codex
 ```
 
-## 自动更新
-
-安装或更新 runtime 后，工具会在 `~/.config/oh-langfuse/runtime.json` 记录 Claude Code / OpenCode / Codex 当前写入本机 runtime 的 `oh-langfuse` 版本。
-
-OpenCode 生成的 `launch-opencode-langfuse.*` 会在启动 agent 前执行一次更新检测：如果 npm 上的 `oh-langfuse@latest` 高于本机 runtime 版本，会提示是否更新；用户确认后才会运行 `npx oh-langfuse@latest update opencode`。Claude Code 和 Codex 也会生成对应 launcher：
-
-OpenCode setup 还会生成 `~/.config/opencode/bin/opencode` / `opencode.cmd` 命令包装器，并把该目录写入用户 PATH。新开终端后直接运行 `opencode`，会先用轻量脚本检测 `oh-langfuse` runtime 是否需要更新，再转发到真实 OpenCode CLI。为了避免 Windows 下在 agent 启动链路里嵌套运行 Node/npm installer 导致启动崩溃，`opencode` 命令只做检测和提示；需要更新时请关闭 agent 后运行提示中的 `npx oh-langfuse@latest update opencode`。
+## 鑷姩鏇存柊
 
+瀹夎鎴栨洿鏂?runtime 鍚庯紝宸ュ叿浼氬湪 `~/.config/oh-langfuse/runtime.json` 璁板綍 Claude Code / OpenCode / Codex 褰撳墠鍐欏叆鏈満 runtime 鐨?`oh-langfuse` 鐗堟湰銆?
+OpenCode 鐢熸垚鐨?`launch-opencode-langfuse.*` 浼氬湪鍚姩 agent 鍓嶆墽琛屼竴娆℃洿鏂版娴嬶細濡傛灉 npm 涓婄殑 `oh-langfuse@latest` 楂樹簬鏈満 runtime 鐗堟湰锛屼細鎻愮ず鏄惁鏇存柊锛涚敤鎴风‘璁ゅ悗鎵嶄細杩愯 `npx oh-langfuse@latest update opencode`銆侰laude Code 鍜?Codex 涔熶細鐢熸垚瀵瑰簲 launcher锛?
+OpenCode setup 杩樹細鐢熸垚 `~/.config/opencode/bin/opencode` / `opencode.cmd` 鍛戒护鍖呰鍣紝骞舵妸璇ョ洰褰曞啓鍏ョ敤鎴?PATH銆傛柊寮€缁堢鍚庣洿鎺ヨ繍琛?`opencode`锛屼細鍏堢敤杞婚噺鑴氭湰妫€娴?`oh-langfuse` runtime 鏄惁闇€瑕佹洿鏂帮紝鍐嶈浆鍙戝埌鐪熷疄 OpenCode CLI銆備负浜嗛伩鍏?Windows 涓嬪湪 agent 鍚姩閾捐矾閲屽祵濂楄繍琛?Node/npm installer 瀵艰嚧鍚姩宕╂簝锛宍opencode` 鍛戒护鍙仛妫€娴嬪拰鎻愮ず锛涢渶瑕佹洿鏂版椂璇峰叧闂?agent 鍚庤繍琛屾彁绀轰腑鐨?`npx oh-langfuse@latest update opencode`銆?
 - `~/.claude/launch-claude-langfuse.cmd` / `~/.claude/launch-claude-langfuse.sh`
 - `~/.codex/launch-codex-langfuse.cmd` / `~/.codex/launch-codex-langfuse.sh`
 
-如果直接运行系统原始的 `claude` / `codex` 命令，工具不会强行替换该命令；需要使用上述 launcher 才能做到启动前检测并提示更新。也可以手动运行：
-
+濡傛灉鐩存帴杩愯绯荤粺鍘熷鐨?`claude` / `codex` 鍛戒护锛屽伐鍏蜂笉浼氬己琛屾浛鎹㈣鍛戒护锛涢渶瑕佷娇鐢ㄤ笂杩?launcher 鎵嶈兘鍋氬埌鍚姩鍓嶆娴嬪苟鎻愮ず鏇存柊銆備篃鍙互鎵嬪姩杩愯锛?
 ```bash
 npx oh-langfuse@latest auto-update opencode
 npx oh-langfuse@latest auto-update claude
@@ -55,111 +43,100 @@ npx oh-langfuse@latest auto-update codex
 
 ## Skill 使用量统计
 
-工具会为每次识别到的 skill 使用额外写入一条通用 observation，skill 名称放在 metadata 中：
+工具会把 skill 使用汇总写入每次交互的 `Agent Turn` observation，不再额外生成 `Skill Use` observation。
 
 ```text
-Observation Name: Skill Use
-metadata.skill_name: <skill_name>
-metadata.skill_use_count: 1
+Observation Name: Agent Turn
+metadata.skill_use_count: 本轮 skill 使用总次数
+metadata.unique_skill_count: 本轮不同 skill 数量
+metadata.repeated_skill_count: 本轮重复 skill 使用次数
+metadata.skill_names: 去重后的 skill 名称列表
+metadata.skill_names_all: 按使用顺序记录的 skill 名称列表
 ```
 
 Dashboard 中统计全部 skill 使用量可配置：
 
 ```text
 View: Observations
-Metric: Count
-Filter: Observation Name equals Skill Use
+Metric: Sum skill_use_count
+Filter: Observation Name equals Agent Turn
 ```
 
-如果当前 Langfuse Dashboard 支持 metadata 维度，可用 `metadata.skill_name` 做 Breakdown 来看各 skill 使用量；否则可用 Metrics API 或导出数据按 `metadata.skill_name` 聚合。`AI Interaction` 仍然保留 `skill_use_count`、`skill_names`、`skill_names_json` 和 `skill_names_csv`，用于查看单次交互的效率汇总。为避免极端情况下产生过多 observation，OpenCode 每次交互最多记录 20 个去重后的 skill 使用事件。
-
-本地开发运行：
+如果当前 Langfuse Dashboard 支持 metadata 维度，可用 `metadata.skill_names` 或导出数据中的 `metadata.skill_names_all` 按 skill 聚合。`skill_names_json`、`skill_names_all_json` 和 `skill_use_events_json` 不再写入，避免和数组字段重复。
+鏈湴寮€鍙戣繍琛岋細
 
 ```bash
 npm install
 npm start
 ```
 
-## 交互式菜单
+## 浜や簰寮忚彍鍗?
+杩愯 `npx oh-langfuse@latest` 浼氭墦寮€浜や簰寮忚彍鍗曪細
 
-运行 `npx oh-langfuse@latest` 会打开交互式菜单：
+- `Up` / `Down` 绉诲姩閫夐」銆?- 鏁板瓧閿揩閫熷畾浣嶃€?- `Space` 鍕鹃€夋垨鍙栨秷銆?- `Enter` 纭銆?- `q` 鎴?`Esc` 閫€鍑恒€?
+澶氶€夎彍鍗曢粯璁や笉鍕鹃€変换浣曠洰鏍囷紝閬垮厤璇銆傜粓绔笉鏀寔鍘熷鎸夐敭杈撳叆鏃讹紝浼氳嚜鍔ㄩ檷绾т负鏁板瓧杈撳叆妯″紡銆?
+## OpenCode 璇存槑
 
-- `Up` / `Down` 移动选项。
-- 数字键快速定位。
-- `Space` 勾选或取消。
-- `Enter` 确认。
-- `q` 或 `Esc` 退出。
-
-多选菜单默认不勾选任何目标，避免误装。终端不支持原始按键输入时，会自动降级为数字输入模式。
-
-## OpenCode 说明
-
-OpenCode 安装会写入：
+OpenCode 瀹夎浼氬啓鍏ワ細
 
 - `~/.config/opencode/opencode.json`
 - `~/.config/opencode/plugins/opencode-plugin-langfuse`
 - `~/.config/opencode-plugin-langfuse/config.json`
-- Windows 下的 `~/.config/opencode/launch-opencode-langfuse.cmd`
-- Linux/macOS 下的 `~/.config/opencode/launch-opencode-langfuse.sh`
-
-Windows 下安装器会尝试写入用户级 `LANGFUSE_PUBLIC_KEY`、`LANGFUSE_SECRET_KEY`、`LANGFUSE_BASEURL`。这些变量对当前已经打开的终端不会立即生效，需要新开终端，或者使用生成的 launcher 启动 OpenCode。
-
-`check opencode` 已按实际情况处理 Windows：如果当前终端还看不到 `LANGFUSE_*`，但用户级环境变量已写入，或 launcher 已生成，会显示 OpenCode 仍有可用的 Langfuse 环境变量来源，不再把这种情况误判为安装失败。
+- Windows 涓嬬殑 `~/.config/opencode/launch-opencode-langfuse.cmd`
+- Linux/macOS 涓嬬殑 `~/.config/opencode/launch-opencode-langfuse.sh`
 
-WSL 用户请直接在 WSL shell 中安装和检查：
+Windows 涓嬪畨瑁呭櫒浼氬皾璇曞啓鍏ョ敤鎴风骇 `LANGFUSE_PUBLIC_KEY`銆乣LANGFUSE_SECRET_KEY`銆乣LANGFUSE_BASEURL`銆傝繖浜涘彉閲忓褰撳墠宸茬粡鎵撳紑鐨勭粓绔笉浼氱珛鍗崇敓鏁堬紝闇€瑕佹柊寮€缁堢锛屾垨鑰呬娇鐢ㄧ敓鎴愮殑 launcher 鍚姩 OpenCode銆?
+`check opencode` 宸叉寜瀹為檯鎯呭喌澶勭悊 Windows锛氬鏋滃綋鍓嶇粓绔繕鐪嬩笉鍒?`LANGFUSE_*`锛屼絾鐢ㄦ埛绾х幆澧冨彉閲忓凡鍐欏叆锛屾垨 launcher 宸茬敓鎴愶紝浼氭樉绀?OpenCode 浠嶆湁鍙敤鐨?Langfuse 鐜鍙橀噺鏉ユ簮锛屼笉鍐嶆妸杩欑鎯呭喌璇垽涓哄畨瑁呭け璐ャ€?
+WSL 鐢ㄦ埛璇风洿鎺ュ湪 WSL shell 涓畨瑁呭拰妫€鏌ワ細
 
 ```bash
 npx oh-langfuse@latest setup opencode --userId=h00613222 --yes
 npx oh-langfuse@latest check opencode
 ```
 
-不会做 Windows 到 WSL 的转发；在 WSL 中运行时，配置写入 WSL 用户自己的 `$HOME/.config/opencode`。
+涓嶄細鍋?Windows 鍒?WSL 鐨勮浆鍙戯紱鍦?WSL 涓繍琛屾椂锛岄厤缃啓鍏?WSL 鐢ㄦ埛鑷繁鐨?`$HOME/.config/opencode`銆?
+## Claude Code 璇存槑
 
-## Claude Code 说明
+Claude Code 瀹夎浼氾細
 
-Claude Code 安装会：
+- 瀹夎 `langfuse_hook.py`
+- 鍒涘缓 `~/.claude/langfuse-venv`
+- 瀹夎 Python 鍖?`langfuse`
+- 鍚堝苟鏇存柊 `~/.claude/settings.json`
+- 閰嶇疆 `Stop` hook
 
-- 安装 `langfuse_hook.py`
-- 创建 `~/.claude/langfuse-venv`
-- 安装 Python 包 `langfuse`
-- 合并更新 `~/.claude/settings.json`
-- 配置 `Stop` hook
+Linux 濡傛灉缂哄皯 venv 鏀寔锛岃鏍规嵁鎻愮ず瀹夎 `python3-venv` 鎴栧搴?Python 鐗堟湰鐨?venv 鍖呫€?
+## Codex 璇存槑
 
-Linux 如果缺少 venv 支持，请根据提示安装 `python3-venv` 或对应 Python 版本的 venv 包。
+Codex 瀹夎浼氾細
 
-## Codex 说明
+- 瀹夎 `codex_langfuse_notify.py`
+- 鍒涘缓 `~/.codex/langfuse-venv`
+- 鍐欏叆 `~/.codex/langfuse/config.json`
+- 鏇存柊 `~/.codex/config.toml` 椤跺眰 `notify`
 
-Codex 安装会：
+閰嶇疆鍚庨渶瑕侀噸鍚?Codex銆俷otify hook 浼氬閲忚鍙?`~/.codex/sessions/**/*.jsonl`锛屾妸鏂扮殑 user銆乤ssistant銆乼ool銆乼oken 浜嬩欢杞崲涓?Langfuse observation锛屽苟鎶婅鍙栧亸绉昏褰曞埌 `~/.codex/langfuse/state.json`銆?
+## 鐜鍙橀噺
 
-- 安装 `codex_langfuse_notify.py`
-- 创建 `~/.codex/langfuse-venv`
-- 写入 `~/.codex/langfuse/config.json`
-- 更新 `~/.codex/config.toml` 顶层 `notify`
-
-配置后需要重启 Codex。notify hook 会增量读取 `~/.codex/sessions/**/*.jsonl`，把新的 user、assistant、tool、token 事件转换为 Langfuse observation，并把读取偏移记录到 `~/.codex/langfuse/state.json`。
-
-## 环境变量
-
-| 变量 | 作用 |
+| 鍙橀噺 | 浣滅敤 |
 | --- | --- |
-| `LANGFUSE_BASEURL` / `LANGFUSE_HOST` | Langfuse 服务地址 |
+| `LANGFUSE_BASEURL` / `LANGFUSE_HOST` | Langfuse 鏈嶅姟鍦板潃 |
 | `LANGFUSE_PUBLIC_KEY` | Langfuse public key |
 | `LANGFUSE_SECRET_KEY` | Langfuse secret key |
-| `LANGFUSE_USER_ID` / `CC_USER_ID` | 用户标识，必须匹配员工号规则 |
-| `CODEX_HOME` | 自定义 Codex home 目录 |
-| `OPENCODE_SKIP_PLUGIN_INSTALL` | 跳过 OpenCode npm 插件安装 |
-| `OPENCODE_NPM_REGISTRY` | OpenCode 插件 npm 安装源 |
-
-Secret key 不会在交互式界面中明文展示。
+| `LANGFUSE_USER_ID` / `CC_USER_ID` | 鐢ㄦ埛鏍囪瘑锛屽繀椤诲尮閰嶅憳宸ュ彿瑙勫垯 |
+| `CODEX_HOME` | 鑷畾涔?Codex home 鐩綍 |
+| `OPENCODE_SKIP_PLUGIN_INSTALL` | 璺宠繃 OpenCode npm 鎻掍欢瀹夎 |
+| `OPENCODE_NPM_REGISTRY` | OpenCode 鎻掍欢 npm 瀹夎婧?|
 
-## 常用维护命令
+Secret key 涓嶄細鍦ㄤ氦浜掑紡鐣岄潰涓槑鏂囧睍绀恒€?
+## 甯哥敤缁存姢鍛戒护
 
 ```bash
 npm run check
 npm pack --dry-run
 ```
 
-发布包暴露两个命令：
+鍙戝竷鍖呮毚闇蹭袱涓懡浠わ細
 
 - `oh-langfuse`
-- `code-tool-langfuse`，兼容旧入口
+- `code-tool-langfuse`锛屽吋瀹规棫鍏ュ彛

package/bin/cli.js

@@ -244,7 +244,7 @@ async function ensureEnvironment(rl, target, options) {
     "Action Needed",
     missing.map(([name, hint]) => `${paint(name, t.red)}  ${paint(hint, t.muted)}`)
   );
-  console.log("");
+  console.log("");
   await rl.question(`${paint("Press Enter after installing the missing dependency, or Ctrl+C to exit.", t.gold)} `);
   return false;
 }
@@ -280,7 +280,7 @@ function labelValue(label, value, valueStyle = t.reset) {
   return `${paint(label.padEnd(22), t.muted)} ${paint(value, valueStyle)}`;
 }
 
-function runNodeScript(name, args = [], { dryRun = false } = {}) {
+function runNodeScript(name, args = [], { dryRun = false, quiet = false } = {}) {
   const target = scriptPath(name);
   const cmd = `${process.execPath} ${target} ${args.join(" ")}`.trim();
   if (dryRun) {
@@ -288,8 +288,8 @@ function runNodeScript(name, args = [], { dryRun = false } = {}) {
     return 0;
   }
   console.log("");
-  console.log(paint("Running installer...", t.bold, t.teal));
-  console.log(paint("─".repeat(Math.min(terminalWidth(), 64)), t.panel));
+  if (!quiet) console.log(paint("Running installer...", t.bold, t.teal));
+  if (!quiet) console.log(paint("─".repeat(Math.min(terminalWidth(), 64)), t.panel));
   const r = spawnSync(process.execPath, [target, ...args], { stdio: "inherit" });
   return r.status != null ? r.status : r.error ? 1 : 0;
 }
@@ -777,7 +777,7 @@ async function setupLangfuseMenu(rl, options) {
 }
 
 function printHelp() {
-  renderBrand({ dryRun: false });
+  renderBrand({ dryRun: false });
   console.log("");
   renderSection("Usage", [
     "npx oh-langfuse@latest",
@@ -812,7 +812,14 @@ function printHelp() {
     `${paint("--help", t.gold)}     Show this help.`
   ]);
 }
-
+
+function commandNeedsPrompt(cmd, target) {
+  if (!cmd) return true;
+  if (cmd === "setup") return true;
+  if (cmd === "check" && !["claude", "opencode", "codex", "environment"].includes(target || "")) return true;
+  return false;
+}
+
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   const options = {
@@ -840,10 +847,10 @@ async function main() {
 
   if (!cmd) return await interactiveMain(options);
 
-  const rl = createPromptInterface({ input: process.stdin, output: process.stdout });
-  try {
-    if (cmd === "setup" && target === "claude") return await setupClaude(rl, options);
-    if (cmd === "setup" && target === "opencode") return await setupOpenCode(rl, options);
+  const rl = commandNeedsPrompt(cmd, target) ? createPromptInterface({ input: process.stdin, output: process.stdout }) : null;
+  try {
+    if (cmd === "setup" && target === "claude") return await setupClaude(rl, options);
+    if (cmd === "setup" && target === "opencode") return await setupOpenCode(rl, options);
     if (cmd === "setup" && target === "codex") return await setupCodex(rl, options);
     if (cmd === "setup") return await setupLangfuseMenu(rl, options);
     if (cmd === "update") {
@@ -864,7 +871,7 @@ async function main() {
         ...(hasValue(options.pipIndexUrl) ? [`--pipIndexUrl=${options.pipIndexUrl}`] : []),
         ...(options.skipCheck ? ["--skip-check"] : []),
         ...(options.yes ? ["--yes"] : []),
-      ], options);
+      ], { ...options, quiet: true });
     }
     if (cmd === "check" && target === "claude") return checkClaude(options);
     if (cmd === "check" && target === "opencode") return checkOpenCode(options);
@@ -876,9 +883,9 @@ async function main() {
       return 0;
     }
     if (cmd === "check") return await checkMenu(rl, options);
-  } finally {
-    rl.close();
-  }
+  } finally {
+    rl?.close();
+  }
 
   printHelp();
   return 1;

package/codex_langfuse_notify.py

@@ -13,12 +13,40 @@ import re
 import sys
 import time
 import hashlib
-from dataclasses import dataclass
-from datetime import datetime, timezone
-from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple
-
-try:
+from dataclasses import dataclass
+from datetime import datetime, timezone
+from pathlib import Path
+from typing import Any, Dict, List, Optional, Tuple
+from urllib.parse import urlparse
+
+
+def configure_langfuse_no_proxy() -> None:
+    hosts = ["localhost", "127.0.0.1"]
+    for key in ("LANGFUSE_HOST", "LANGFUSE_BASEURL", "CODEX_LANGFUSE_BASE_URL"):
+        value = os.environ.get(key)
+        if not value:
+            continue
+        parsed = urlparse(value if "://" in value else f"http://{value}")
+        if parsed.hostname:
+            hosts.append(parsed.hostname)
+        if parsed.netloc:
+            hosts.append(parsed.netloc)
+    existing = []
+    for key in ("NO_PROXY", "no_proxy"):
+        existing.extend([item.strip() for item in os.environ.get(key, "").split(",") if item.strip()])
+    merged = []
+    for item in [*existing, *hosts]:
+        if item and item not in merged:
+            merged.append(item)
+    if merged:
+        value = ",".join(merged)
+        os.environ["NO_PROXY"] = value
+        os.environ["no_proxy"] = value
+
+
+configure_langfuse_no_proxy()
+
+try:
     from langfuse import Langfuse, propagate_attributes
 except Exception:
     sys.exit(0)
@@ -33,7 +61,8 @@ LOG_FILE = STATE_DIR / "codex_langfuse_notify.log"
 
 DEBUG = os.environ.get("CODEX_LANGFUSE_DEBUG", "").lower() == "true"
 MAX_CHARS = int(os.environ.get("CODEX_LANGFUSE_MAX_CHARS", "20000"))
-METRICS_SCHEMA_VERSION = "1.0"
+METRICS_SCHEMA_VERSION = "1.1"
+AGENT_NAME = "codex"
 
 
 def log(level: str, message: str) -> None:
@@ -388,30 +417,43 @@ def build_interaction_metadata(
     model: Optional[str],
     user_message_count: int = 1,
     assistant_message_count: int = 1,
+    skill_use_events: Optional[List[Dict[str, Any]]] = None,
 ) -> Dict[str, Any]:
     tokens = normalize_token_metrics(token_metrics)
+    interaction_id = build_interaction_id(source, session_id, turn_number)
+    events = list(skill_use_events or [])
+    skill_names_all = [str(event.get("skill_name") or "") for event in events if event.get("skill_name")]
+    unique_skill_names = list(dict.fromkeys(skill_names_all))
+    effective_skill_count = len(events) if events else int(skill_use_count or 0)
     return {
         "source": source,
+        "agent": source,
         "user_id": user_id or "",
         "session_id": session_id,
-        "interaction_id": build_interaction_id(source, session_id, turn_number),
+        "interaction_id": interaction_id,
         "metrics_schema_version": METRICS_SCHEMA_VERSION,
         "interaction_count": 1,
         "user_message_count": user_message_count,
         "assistant_message_count": assistant_message_count,
         "tool_call_count": int(tool_call_count or 0),
         "tool_result_count": int(tool_result_count or 0),
-        "skill_use_count": int(skill_use_count or 0),
+        "skill_use_count": effective_skill_count,
+        "unique_skill_count": len(unique_skill_names),
+        "repeated_skill_count": max(0, effective_skill_count - len(unique_skill_names)),
         **tokens,
         "model": model,
         "turn_number": int(turn_number or 0),
         "efficiency": {
             "tokens_per_interaction": tokens.get("total_tokens"),
             "tool_calls_per_interaction": int(tool_call_count or 0),
-            "skills_per_interaction": int(skill_use_count or 0),
+            "skills_per_interaction": effective_skill_count,
             "output_input_token_ratio": _ratio(tokens.get("output_tokens"), tokens.get("input_tokens")),
             "tokens_per_tool_call": _ratio(tokens.get("total_tokens"), int(tool_call_count or 0)),
         },
+        **({
+            "skill_names": unique_skill_names,
+            "skill_names_all": skill_names_all,
+        } if events else {}),
     }
 
 
@@ -439,16 +481,33 @@ def _skill_namespace(name: str) -> str:
     return name.split(":", 1)[0] if ":" in name else ""
 
 
+def _skill_event_type(detected_by: str) -> str:
+    return "invoked" if detected_by in ("tool_call", "plugin_event", "attribution_skill", "slash_command") else "detected"
+
+
+def _skill_id_segment(name: str) -> str:
+    segment = re.sub(r"[^A-Za-z0-9_.:-]+", "-", str(name or "").strip()).strip("-")
+    return (segment or "unknown")[:96]
+
+
 def detect_skill_usages(tool_calls: List[Dict[str, Any]], known_skills: set) -> List[Dict[str, str]]:
-    found: Dict[str, str] = {}
+    found: List[Dict[str, str]] = []
+    seen_call_ids: set = set()
     for call in tool_calls or []:
         tool_name = str(call.get("name") or "")
+        call_id = str(call.get("id") or call.get("call_id") or call.get("callId") or call.get("tool_call_id") or call.get("toolCallId") or "").strip()
         input_obj = call.get("input") if isinstance(call.get("input"), (dict, list, str)) else {}
         if tool_name.lower() == "skill" and isinstance(input_obj, dict):
             for key in ("skill_name", "skill", "name"):
                 value = input_obj.get(key)
                 if isinstance(value, str) and value.strip():
-                    found[value.strip()] = "tool_call"
+                    name = value.strip()
+                    if call_id:
+                        dedupe_key = f"call:{call_id}"
+                        if dedupe_key in seen_call_ids:
+                            break
+                        seen_call_ids.add(dedupe_key)
+                    found.append({"name": name, "skill_namespace": _skill_namespace(name), "detected_by": "tool_call", "skill_call_id": call_id})
                     break
         try:
             text = json.dumps(input_obj, ensure_ascii=False)
@@ -457,11 +516,53 @@ def detect_skill_usages(tool_calls: List[Dict[str, Any]], known_skills: set) ->
         for match in re.finditer(r"([A-Za-z]:)?[^\"'\n\r]*[\\/]+([^\\/\"'\n\r]+)[\\/]+SKILL\.md", text, re.IGNORECASE):
             candidate = match.group(2)
             if candidate and (candidate in known_skills or not known_skills):
-                found[candidate] = "skill_file_path"
-    return [
-        {"name": name, "skill_namespace": _skill_namespace(name), "detected_by": detected_by}
-        for name, detected_by in sorted(found.items())
-    ]
+                found.append({"name": candidate, "skill_namespace": _skill_namespace(candidate), "detected_by": "skill_file_path"})
+    return found
+
+
+def build_skill_use_events(interaction_id: str, skill_usages: List[Dict[str, str]]) -> List[Dict[str, Any]]:
+    events: List[Dict[str, Any]] = []
+    deduped: List[Dict[str, str]] = []
+    seen_call_ids: set = set()
+    for skill in skill_usages or []:
+        call_id = str(skill.get("skill_call_id") or "").strip()
+        if call_id:
+            dedupe_key = f"call:{call_id}"
+            if dedupe_key in seen_call_ids:
+                continue
+            seen_call_ids.add(dedupe_key)
+        deduped.append(skill)
+    total = len(deduped)
+    for index, skill in enumerate(deduped, start=1):
+        name = str(skill.get("name") or "").strip()
+        if not name:
+            continue
+        detected_by = str(skill.get("detected_by") or "metadata")
+        call_id = str(skill.get("skill_call_id") or "").strip()
+        events.append({
+            "skill_use_id": f"{interaction_id}:skill:{index}:{_skill_id_segment(name)}",
+            "skill_use_index": index,
+            "skill_use_count_in_interaction": total,
+            "skill_event_type": _skill_event_type(detected_by),
+            "skill_trigger": "unknown",
+            "skill_name": name,
+            "skill_use_count": 1,
+            "skill_namespace": skill.get("skill_namespace") or _skill_namespace(name),
+            "detected_by": detected_by,
+            **({"skill_call_id": call_id} if call_id else {}),
+        })
+    return events
+
+
+def summarize_skill_usages(skill_usages: List[Dict[str, str]]) -> List[Dict[str, Any]]:
+    summary: Dict[str, Dict[str, Any]] = {}
+    for item in skill_usages or []:
+        name = item.get("name")
+        if not name:
+            continue
+        entry = summary.setdefault(name, {"name": name, "count": 0, "detected_by": item.get("detected_by")})
+        entry["count"] += 1
+    return list(summary.values())
 
 
 def get_payload(row: Dict[str, Any]) -> Dict[str, Any]:
@@ -586,6 +687,8 @@ def emit_codex_turn(
     tool_calls = material.get("tool_calls") or []
     tool_results = material.get("tool_results") or []
     skill_usages = detect_skill_usages(tool_calls, discover_known_skills())
+    interaction_id = build_interaction_id("codex", session_id, turn_num)
+    skill_use_events = build_skill_use_events(interaction_id, skill_usages)
     interaction_meta = build_interaction_metadata(
         "codex",
         user_id,
@@ -594,28 +697,28 @@ def emit_codex_turn(
         usage_details,
         len(tool_calls),
         len(tool_results),
-        len(skill_usages),
+        len(skill_use_events),
         model,
         user_message_count=1 if material.get("user_text") else 0,
         assistant_message_count=1 if material.get("assistant_text") else 0,
+        skill_use_events=skill_use_events,
     )
-    skill_summary = [
-        {"name": item["name"], "count": 1, "detected_by": item["detected_by"]}
-        for item in skill_usages
-    ]
+    skill_summary = summarize_skill_usages(skill_usages)
 
     with propagate_attributes(
         user_id=user_id,
         session_id=session_id,
-        trace_name=f"Codex - Turn {turn_num}",
-        tags=["codex"],
+        trace_name="Agent Turn",
+        tags=[AGENT_NAME],
     ):
-        with langfuse.start_as_current_observation(
-            name=f"Codex - Turn {turn_num}",
+        with langfuse.start_as_current_observation(
+            name="Agent Turn",
             input={"role": "user", "content": user_text},
+            output={"role": "assistant", "content": assistant_text},
             metadata={
                 **interaction_meta,
-                "source": "codex",
+                "source": AGENT_NAME,
+                "agent": AGENT_NAME,
                 "session_id": session_id,
                 "turn_number": turn_num,
                 "session_path": str(session_path),
@@ -628,15 +731,7 @@ def emit_codex_turn(
             },
         ) as trace_span:
             with langfuse.start_as_current_observation(
-                name="AI Interaction",
-                input={"role": "user", "content": user_text},
-                output={"role": "assistant", "content": assistant_text},
-                metadata=interaction_meta,
-            ):
-                pass
-
-            with langfuse.start_as_current_observation(
-                name="Codex Response",
+                name="Agent Response",
                 as_type="generation",
                 model=model,
                 input={"role": "user", "content": user_text},
@@ -644,7 +739,8 @@ def emit_codex_turn(
                 usage_details=usage_details or None,
                 metadata={
                     "assistant_text": assistant_meta,
-                    "source": "codex",
+                    "source": AGENT_NAME,
+                    "agent": AGENT_NAME,
                     "user_id": user_id or "",
                     "session_id": session_id,
                     "interaction_id": interaction_meta["interaction_id"],
@@ -653,32 +749,15 @@ def emit_codex_turn(
             ):
                 pass
 
-            for skill in skill_usages:
-                with langfuse.start_as_current_observation(
-                    name="Skill Use",
-                    metadata={
-                        "source": "codex",
-                        "user_id": user_id or "",
-                        "session_id": session_id,
-                        "interaction_id": interaction_meta["interaction_id"],
-                        "skill_name": skill["name"],
-                        "skill_use_count": 1,
-                        "skill_namespace": skill["skill_namespace"],
-                        "detected_by": skill["detected_by"],
-                        "turn_number": turn_num,
-                        "metrics_schema_version": METRICS_SCHEMA_VERSION,
-                    },
-                ):
-                    pass
-
             for call in tool_calls:
                 tool_input, input_meta = truncate(call.get("input"))
                 with langfuse.start_as_current_observation(
-                    name=f"Tool: {call.get('name') or 'tool'}",
+                    name="Tool Call",
                     as_type="tool",
                     input=tool_input,
                     metadata={
-                        "source": "codex",
+                        "source": AGENT_NAME,
+                        "agent": AGENT_NAME,
                         "user_id": user_id or "",
                         "session_id": session_id,
                         "interaction_id": interaction_meta["interaction_id"],
@@ -694,10 +773,11 @@ def emit_codex_turn(
             for result in tool_results:
                 output, output_meta = truncate(result.get("output"))
                 with langfuse.start_as_current_observation(
-                    name=f"Tool Result: {result.get('name') or 'tool'}",
+                    name="Tool Result",
                     as_type="tool",
                     metadata={
-                        "source": "codex",
+                        "source": AGENT_NAME,
+                        "agent": AGENT_NAME,
                         "user_id": user_id or "",
                         "session_id": session_id,
                         "interaction_id": interaction_meta["interaction_id"],