oh-langfuse 0.1.71 → 0.1.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-langfuse",
-  "version": "0.1.71",
+  "version": "0.1.72",
   "private": false,
   "type": "module",
   "description": "Use npm scripts to configure Claude Code / OpenCode / Codex with Langfuse tracing.",
@@ -16,6 +16,7 @@
     "scripts/auto-update-runtime.mjs",
     "scripts/codex-langfuse-check.mjs",
     "scripts/codex-langfuse-setup.mjs",
+    "scripts/cli-detection-utils.mjs",
     "scripts/json-utils.mjs",
     "scripts/langfuse-check.mjs",
     "scripts/langfuse-setup.mjs",

package/scripts/cli-detection-utils.mjs

@@ -0,0 +1,114 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { spawnSync } from "node:child_process";
+
+function unique(values) {
+  return [...new Set(values.filter(Boolean))];
+}
+
+function stripExecutableExtension(name) {
+  return String(name || "").replace(/\.(cmd|bat|exe)$/i, "");
+}
+
+function isTargetBinary(target, candidate) {
+  const base = stripExecutableExtension(path.basename(String(candidate || ""))).toLowerCase();
+  return base === String(target || "").toLowerCase();
+}
+
+function sortWindowsCliCandidates(candidates) {
+  const extPriority = (candidate) => {
+    const ext = path.extname(String(candidate || "")).toLowerCase();
+    if (ext === ".cmd" || ext === ".bat" || ext === ".exe") return 0;
+    return 1;
+  };
+  return [...candidates].sort((a, b) => extPriority(a) - extPriority(b));
+}
+
+export function parseWhereisBinaryOutput(target, stdout) {
+  const candidates = [];
+  for (const line of String(stdout || "").split(/\r?\n/)) {
+    const colon = line.indexOf(":");
+    const body = colon === -1 ? line : line.slice(colon + 1);
+    for (const token of body.split(/\s+/)) {
+      const candidate = token.trim();
+      if (candidate && path.isAbsolute(candidate) && isTargetBinary(target, candidate)) {
+        candidates.push(candidate);
+      }
+    }
+  }
+  return unique(candidates);
+}
+
+function isLikelyNodePrefix(name) {
+  return /^(node|nodejs)(?:[-_.].*)?$/i.test(String(name || ""));
+}
+
+export function listCommonUnixCliCandidates(target, roots = ["/usr/local", "/opt"]) {
+  if (process.platform === "win32") return [];
+  const candidates = [
+    path.join("/usr/local", "bin", target),
+    path.join("/usr", "bin", target),
+    path.join("/bin", target),
+  ];
+  for (const root of roots) {
+    try {
+      if (!fs.existsSync(root)) continue;
+      for (const ent of fs.readdirSync(root, { withFileTypes: true })) {
+        if (ent.isDirectory() && isLikelyNodePrefix(ent.name)) {
+          candidates.push(path.join(root, ent.name, "bin", target));
+        }
+      }
+    } catch {
+      // Best effort only; command lookups and other candidates may still work.
+    }
+  }
+  return unique(candidates);
+}
+
+export function listSystemCliCandidates(target) {
+  if (!target) return [];
+  const candidates = [];
+  if (process.platform === "win32") {
+    const result = spawnSync("where.exe", [target], { encoding: "utf8", windowsHide: true });
+    if (result.status === 0) {
+      candidates.push(...String(result.stdout || "").split(/\r?\n/).map((line) => line.trim()).filter(Boolean));
+    }
+    return sortWindowsCliCandidates(unique(candidates));
+  }
+
+  const which = spawnSync("which", ["-a", target], { encoding: "utf8", windowsHide: true });
+  if (which.status === 0) {
+    candidates.push(...String(which.stdout || "").split(/\r?\n/).map((line) => line.trim()).filter(Boolean));
+  }
+
+  const whereis = spawnSync("whereis", ["-b", target], { encoding: "utf8", windowsHide: true });
+  if (whereis.status === 0) {
+    candidates.push(...parseWhereisBinaryOutput(target, whereis.stdout));
+  }
+
+  candidates.push(...listCommonUnixCliCandidates(target));
+  return unique(candidates);
+}
+
+export function candidateExists(candidate) {
+  try {
+    return Boolean(candidate) && fs.existsSync(candidate);
+  } catch {
+    return false;
+  }
+}
+
+export function hasSystemCli(target) {
+  return listSystemCliCandidates(target).some(candidateExists);
+}
+
+export function defaultWindowsNpmCliCandidates(target) {
+  const appData = process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
+  if (process.platform !== "win32") return [];
+  return [
+    path.join(appData, "npm", `${target}.cmd`),
+    path.join(appData, "npm", `${target}.exe`),
+    path.join(appData, "npm", target),
+  ];
+}

package/scripts/codex-langfuse-setup.mjs

@@ -2,9 +2,10 @@ import fs from "node:fs";
 import fsp from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
-import { execFileSync, spawnSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
-import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
+import { execFileSync, spawnSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { defaultWindowsNpmCliCandidates, listSystemCliCandidates } from "./cli-detection-utils.mjs";
+import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
 
 const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const USER_ID_PATTERN = /^[a-z](?:\d{8}|wx\d{7})$/;
@@ -217,19 +218,11 @@ function listLocalCodexCliCandidates() {
   return candidates;
 }
 
-function listCliCandidatesFromPath(target) {
-  const cmd = process.platform === "win32" ? "where.exe" : "which";
-  const args = process.platform === "win32" ? [target] : ["-a", target];
-  const result = spawnSync(cmd, args, { encoding: "utf8", windowsHide: true });
-  if (result.status !== 0) return [];
-  const candidates = String(result.stdout || "")
-    .split(/\r?\n/)
-    .map((line) => line.trim())
-    .filter(Boolean);
-  return process.platform === "win32" ? sortWindowsCliCandidates(candidates) : candidates;
-}
-
-function sortWindowsCliCandidates(candidates) {
+function listCliCandidatesFromPath(target) {
+  return listSystemCliCandidates(target);
+}
+
+function sortWindowsCliCandidates(candidates) {
   const extPriority = (candidate) => {
     const ext = path.extname(String(candidate || "")).toLowerCase();
     if (ext === ".cmd" || ext === ".bat" || ext === ".exe") return 0;
@@ -238,16 +231,13 @@ function sortWindowsCliCandidates(candidates) {
   return [...candidates].sort((a, b) => extPriority(a) - extPriority(b));
 }
 
-function resolveAgentCli({ target, preferred = "", shimDir = "" }) {
-  const appData = process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
-  const candidates = [
-    preferred,
-    ...(target === "codex" ? listLocalCodexCliCandidates() : []),
-    process.platform === "win32" ? path.join(appData, "npm", `${target}.cmd`) : "",
-    process.platform === "win32" ? path.join(appData, "npm", `${target}.exe`) : "",
-    process.platform === "win32" ? path.join(appData, "npm", target) : "",
-    ...listCliCandidatesFromPath(target)
-  ];
+function resolveAgentCli({ target, preferred = "", shimDir = "" }) {
+  const candidates = [
+    preferred,
+    ...(target === "codex" ? listLocalCodexCliCandidates() : []),
+    ...defaultWindowsNpmCliCandidates(target),
+    ...listCliCandidatesFromPath(target)
+  ];
   for (const candidate of candidates) {
     const found = existingCliCandidate(candidate, shimDir);
     if (found) return found;

package/scripts/langfuse-setup.mjs

@@ -2,9 +2,10 @@ import fs from "node:fs";
 import fsp from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
-import { execFileSync, spawnSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
-import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
+import { execFileSync, spawnSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { defaultWindowsNpmCliCandidates, listSystemCliCandidates } from "./cli-detection-utils.mjs";
+import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
 
 const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const packageJson = JSON.parse(fs.readFileSync(path.join(packageRoot, "package.json"), "utf8"));
@@ -221,26 +222,16 @@ function existingCliCandidate(candidate, shimDir) {
   }
 }
 
-function listCliCandidatesFromPath(target) {
-  const cmd = process.platform === "win32" ? "where.exe" : "which";
-  const args = process.platform === "win32" ? [target] : ["-a", target];
-  const result = spawnSync(cmd, args, { encoding: "utf8", windowsHide: true });
-  if (result.status !== 0) return [];
-  return String(result.stdout || "")
-    .split(/\r?\n/)
-    .map((line) => line.trim())
-    .filter(Boolean);
-}
-
-function resolveAgentCli({ target, preferred = "", shimDir = "" }) {
-  const appData = process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
-  const candidates = [
-    preferred,
-    process.platform === "win32" ? path.join(appData, "npm", `${target}.cmd`) : "",
-    process.platform === "win32" ? path.join(appData, "npm", `${target}.exe`) : "",
-    process.platform === "win32" ? path.join(appData, "npm", target) : "",
-    ...listCliCandidatesFromPath(target)
-  ];
+function listCliCandidatesFromPath(target) {
+  return listSystemCliCandidates(target);
+}
+
+function resolveAgentCli({ target, preferred = "", shimDir = "" }) {
+  const candidates = [
+    preferred,
+    ...defaultWindowsNpmCliCandidates(target),
+    ...listCliCandidatesFromPath(target)
+  ];
   for (const candidate of candidates) {
     const found = existingCliCandidate(candidate, shimDir);
     if (found) return found;

package/scripts/resolve-opencode-cli.mjs

@@ -1,7 +1,8 @@
 import fs from "node:fs";
-import path from "node:path";
-import os from "node:os";
-import { spawnSync } from "node:child_process";
+import path from "node:path";
+import os from "node:os";
+import { spawnSync } from "node:child_process";
+import { listSystemCliCandidates } from "./cli-detection-utils.mjs";
 
 /**
  * OpenCode CLI 的官方安装脚本默认会把二进制放到 ~/.opencode/bin；
@@ -36,10 +37,11 @@ export function resolveOpencodeCli(preferred) {
       candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-windows-x64-baseline", "bin", "opencode.exe"));
     }
     candidates.push(path.join(home, "scoop", "shims", "opencode.exe"));
-  } else {
-    candidates.push(path.join(home, ".opencode", "bin", "opencode"));
-    candidates.push(path.join(home, ".local", "bin", "opencode"));
-  }
+  } else {
+    candidates.push(path.join(home, ".opencode", "bin", "opencode"));
+    candidates.push(path.join(home, ".local", "bin", "opencode"));
+    candidates.push(...listSystemCliCandidates("opencode"));
+  }
 
   for (const c of candidates) {
     if (c && fs.existsSync(c)) return c;

package/scripts/update-langfuse-runtime.mjs

@@ -1,10 +1,11 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { spawnSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
-import { buildUpdatePlan, extractVersionFromNpmMetadata } from "./update-utils.mjs";
-import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
+import { spawnSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { hasSystemCli } from "./cli-detection-utils.mjs";
+import { buildUpdatePlan, extractVersionFromNpmMetadata } from "./update-utils.mjs";
+import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
 
 const rootDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const packageJson = JSON.parse(fs.readFileSync(path.join(rootDir, "package.json"), "utf8"));
@@ -59,16 +60,21 @@ function readJsonIfExists(p) {
   }
 }
 
-function detectInstalledTargets(home = os.homedir()) {
-  const codexHome = process.env.CODEX_HOME || path.join(home, ".codex");
-  return {
-    claude: fs.existsSync(path.join(home, ".claude", "hooks", "langfuse_hook.py")),
-    opencode:
-      fs.existsSync(path.join(home, ".config", "opencode", "opencode.json")) ||
-      fs.existsSync(path.join(home, ".config", "opencode", "plugins", "opencode-plugin-langfuse")),
-    codex: fs.existsSync(path.join(codexHome, "hooks", "codex_langfuse_notify.py")),
-  };
-}
+function detectInstalledTargets(home = os.homedir()) {
+  const codexHome = process.env.CODEX_HOME || path.join(home, ".codex");
+  return {
+    claude:
+      fs.existsSync(path.join(home, ".claude", "hooks", "langfuse_hook.py")) ||
+      hasSystemCli("claude"),
+    opencode:
+      fs.existsSync(path.join(home, ".config", "opencode", "opencode.json")) ||
+      fs.existsSync(path.join(home, ".config", "opencode", "plugins", "opencode-plugin-langfuse")) ||
+      hasSystemCli("opencode"),
+    codex:
+      fs.existsSync(path.join(codexHome, "hooks", "codex_langfuse_notify.py")) ||
+      hasSystemCli("codex"),
+  };
+}
 
 function claudeConfig(home) {
   const settings = readJsonIfExists(path.join(home, ".claude", "settings.json")) || {};