oh-langfuse 0.1.73 → 0.1.75

package/codex_langfuse_notify.py

@@ -748,6 +748,10 @@ def _skill_agent_path(agent: str, detected_by: str) -> str:
             return "codex_skill_script_exec"
         if detected_by == "codex_implicit_doc_read":
             return "codex_skill_doc_read"
+        if detected_by == "codex_skill_tool":
+            return "codex_skill_tool_invoke"
+        if detected_by == "codex_skill_doc_read":
+            return "codex_skill_doc_read_tool"
         if detected_by == "tool_call":
             return "codex_unsupported_skill_tool"
     if detected_by == "skill_file_path":
@@ -758,7 +762,7 @@ def _skill_agent_path(agent: str, detected_by: str) -> str:
 def _skill_invocation_mode(agent: str, detected_by: str) -> str:
     if agent == "codex" and detected_by == "codex_explicit_injection":
         return "explicit"
-    if agent == "codex" and detected_by in ("codex_implicit_script", "codex_implicit_doc_read"):
+    if agent == "codex" and detected_by in ("codex_implicit_script", "codex_implicit_doc_read", "codex_skill_tool", "codex_skill_doc_read"):
         return "implicit"
     return "detected"
 
@@ -766,7 +770,7 @@ def _skill_invocation_mode(agent: str, detected_by: str) -> str:
 def _skill_event_type(detected_by: str, agent: str = "unknown") -> str:
     if agent == "codex" and detected_by == "tool_call":
         return "detected"
-    return "invoked" if detected_by in ("codex_explicit_injection", "codex_implicit_script", "codex_implicit_doc_read") else "detected"
+    return "invoked" if detected_by in ("codex_explicit_injection", "codex_implicit_script", "codex_implicit_doc_read", "codex_skill_tool", "codex_skill_doc_read") else "detected"
 
 
 def _skill_id_segment(name: str) -> str:
@@ -837,7 +841,31 @@ def _detect_codex_skill_command(command: str, known_skills: set) -> List[Dict[st
 def detect_skill_usages(tool_calls: List[Dict[str, Any]], known_skills: set) -> List[Dict[str, str]]:
     found: List[Dict[str, str]] = []
     for call in tool_calls or []:
+        call_name = str(call.get("name") or "").strip().lower()
         input_obj = call.get("input") if isinstance(call.get("input"), (dict, list, str)) else {}
+
+        if call_name == "skill":
+            skill_input_name = None
+            if isinstance(input_obj, dict):
+                skill_input_name = str(input_obj.get("name") or "").strip()
+            if skill_input_name:
+                name = _accept_known_skill(skill_input_name, known_skills)
+                if name:
+                    found.append(_skill_usage(name, "codex_skill_tool"))
+            continue
+
+        if call_name == "read":
+            if isinstance(input_obj, dict):
+                file_path = str(input_obj.get("filePath") or "").strip()
+                if file_path:
+                    doc_pattern = r"[\\/](?:skills|skill)[\\/]([^\\/\"'\s]+)[\\/]SKILL\.md$"
+                    match = re.search(doc_pattern, file_path, re.IGNORECASE)
+                    if match:
+                        name = _accept_known_skill(match.group(1), known_skills)
+                        if name:
+                            found.append(_skill_usage(name, "codex_skill_doc_read"))
+            continue
+
         found.extend(_detect_codex_skill_command(_command_from_tool_input(input_obj), known_skills))
     return found
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-langfuse",
-  "version": "0.1.73",
+  "version": "0.1.75",
   "private": false,
   "type": "module",
   "description": "Use npm scripts to configure Claude Code / OpenCode / Codex with Langfuse tracing.",

package/scripts/opencode-langfuse-setup.mjs

@@ -1007,7 +1007,8 @@ function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl,
     cmd.push(...windowsGitPathBootstrap());
     cmd.push(windowsAutoUpdateCommand("opencode"));
     cmd.push(`set "OH_LANGFUSE_REAL_OPENCODE=${cmdSetValue(realOpencodeCli)}"`);
-    cmd.push('if exist "%OH_LANGFUSE_REAL_OPENCODE%" (');
+    cmd.push('echo "%OH_LANGFUSE_REAL_OPENCODE%" | findstr /I "\\node_modules\\opencode-ai\\bin\\opencode.exe" >nul');
+    cmd.push('if errorlevel 1 if exist "%OH_LANGFUSE_REAL_OPENCODE%" (');
     cmd.push('  call "%OH_LANGFUSE_REAL_OPENCODE%" %*');
     cmd.push("  exit /b %ERRORLEVEL%");
     cmd.push(")");
@@ -1023,10 +1024,6 @@ function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl,
     cmd.push('  call "%APPDATA%\\npm\\opencode.cmd" %*');
     cmd.push("  exit /b %ERRORLEVEL%");
     cmd.push(")");
-    cmd.push('if exist "%APPDATA%\\npm\\node_modules\\opencode-ai\\bin\\opencode.exe" (');
-    cmd.push('  call "%APPDATA%\\npm\\node_modules\\opencode-ai\\bin\\opencode.exe" %*');
-    cmd.push("  exit /b %ERRORLEVEL%");
-    cmd.push(")");
     cmd.push('if exist "%APPDATA%\\npm\\node_modules\\opencode-ai\\node_modules\\opencode-windows-x64\\bin\\opencode.exe" (');
     cmd.push('  call "%APPDATA%\\npm\\node_modules\\opencode-ai\\node_modules\\opencode-windows-x64\\bin\\opencode.exe" %*');
     cmd.push("  exit /b %ERRORLEVEL%");
@@ -1045,8 +1042,11 @@ function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl,
     cmd.push(")");
     cmd.push('for /f "delims=" %%O in (\'where.exe opencode 2^>nul\') do (');
     cmd.push('  if /I not "%%~fO"=="%~f0" (');
-    cmd.push('    call "%%O" %*');
-    cmd.push("    exit /b %ERRORLEVEL%");
+    cmd.push('    echo %%~fO | findstr /I "\\node_modules\\opencode-ai\\bin\\opencode.exe" >nul');
+    cmd.push("    if errorlevel 1 (");
+    cmd.push('      call "%%O" %*');
+    cmd.push("      exit /b %ERRORLEVEL%");
+    cmd.push("    )");
     cmd.push("  )");
     cmd.push(")");
     cmd.push("echo [ERROR] OpenCode CLI not found. Install OpenCode CLI first. 1>&2");

package/scripts/resolve-opencode-cli.mjs

@@ -3,18 +3,28 @@ import path from "node:path";
 import os from "node:os";
 import { spawnSync } from "node:child_process";
 import { listSystemCliCandidates } from "./cli-detection-utils.mjs";
-
-/**
+
+function isKnownBrokenWindowsOpencodeCandidate(candidate) {
+  if (process.platform !== "win32") return false;
+  const normalized = String(candidate || "").replace(/\//g, "\\").toLowerCase();
+  return normalized.endsWith("\\node_modules\\opencode-ai\\bin\\opencode.exe");
+}
+
+function usableCandidate(candidate) {
+  return candidate && !isKnownBrokenWindowsOpencodeCandidate(candidate) && fs.existsSync(candidate);
+}
+
+/**
  * OpenCode CLI 的官方安装脚本默认会把二进制放到 ~/.opencode/bin；
  * npm 全局安装则可能出现在 %AppData%\npm\opencode.cmd；PATH 也可能只认识 `opencode`。
  * @param {string|undefined} preferred --cmd=xxx 或可执行文件路径
  * @returns {string|null} 可执行的绝对路径，或仅在 PATH 中解析到则用 `opencode`
  */
 export function resolveOpencodeCli(preferred) {
-  if (typeof preferred === "string" && preferred.trim()) {
-    const p = preferred.trim();
-    if (fs.existsSync(p)) return path.resolve(p);
-  }
+  if (typeof preferred === "string" && preferred.trim()) {
+    const p = preferred.trim();
+    if (usableCandidate(p)) return path.resolve(p);
+  }
 
   const home = os.homedir();
 
@@ -30,7 +40,6 @@ export function resolveOpencodeCli(preferred) {
     if (process.env.APPDATA) {
       candidates.push(path.join(process.env.APPDATA, "npm", "opencode.cmd"));
       candidates.push(path.join(process.env.APPDATA, "npm", "opencode"));
-      candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-ai", "bin", "opencode.exe"));
       candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-ai", "node_modules", "opencode-windows-x64", "bin", "opencode.exe"));
       candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-ai", "node_modules", "opencode-windows-x64-baseline", "bin", "opencode.exe"));
       candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-windows-x64", "bin", "opencode.exe"));
@@ -42,17 +51,17 @@ export function resolveOpencodeCli(preferred) {
     candidates.push(path.join(home, ".local", "bin", "opencode"));
     candidates.push(...listSystemCliCandidates("opencode"));
   }
-
-  for (const c of candidates) {
-    if (c && fs.existsSync(c)) return c;
-  }
+
+  for (const c of candidates) {
+    if (usableCandidate(c)) return c;
+  }
 
   if (process.platform === "win32") {
     const r = spawnSync("where.exe", ["opencode"], { encoding: "utf8", windowsHide: true });
     if (r.status === 0 && r.stdout) {
-      const line = r.stdout.trim().split(/\r?\n/)[0]?.trim();
-      if (line && fs.existsSync(line)) return line;
-    }
+      const line = r.stdout.trim().split(/\r?\n/)[0]?.trim();
+      if (usableCandidate(line)) return line;
+    }
   } else {
     const r = spawnSync("which", ["opencode"], { encoding: "utf8" });
     if (r.status === 0 && r.stdout) {