oh-langfuse 0.1.79 → 0.1.80

package/scripts/cli-detection-utils.mjs

@@ -1,114 +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),
-  ];
-}
+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-check.mjs

@@ -38,47 +38,47 @@ function findLatestSession(sessionsDir) {
   return latest;
 }
 
-function commandOk(cmd, args, env = process.env) {
-  const r = spawnSync(cmd, args, { encoding: "utf8", env });
-  return { ok: !r.error && r.status === 0, detail: (r.stdout || r.stderr || "").trim() };
-}
-
-function isWindowsAppsPath(candidate) {
-  return String(candidate || "").toLowerCase().includes("\\program files\\windowsapps\\");
-}
-
-function readCodexShimTarget(codexHome) {
-  if (process.platform !== "win32") return "";
-  const shimPath = path.join(codexHome, "bin", "codex.cmd");
-  if (!fs.existsSync(shimPath)) return "";
-  const text = stripBom(fs.readFileSync(shimPath, "utf8"));
-  const matches = text.matchAll(/^\s*call\s+"([^"]+)"/gim);
-  for (const match of matches) {
-    const base = path.basename(match[1]).toLowerCase();
-    if (base === "codex.exe" || base === "codex.cmd" || base === "codex") return match[1];
-  }
-  return "";
-}
-
-function venvPython(codexHome) {
-  return process.platform === "win32"
-    ? path.join(codexHome, "langfuse-venv", "Scripts", "python.exe")
-    : path.join(codexHome, "langfuse-venv", "bin", "python");
-}
-
-function fallbackPythonCommand() {
-  return process.platform === "win32" ? "python" : "python3";
-}
-
-function isolatedPythonPath(codexHome) {
-  return path.join(codexHome, "langfuse-python");
-}
-
-function langfuseImportOk(hookPython, fallbackTarget) {
-  if (fs.existsSync(hookPython)) return commandOk(hookPython, ["-c", "import langfuse; print('langfuse ok')"]);
-  const env = { ...process.env, PYTHONPATH: process.env.PYTHONPATH ? `${fallbackTarget}${path.delimiter}${process.env.PYTHONPATH}` : fallbackTarget };
-  return commandOk(fallbackPythonCommand(), ["-c", "import langfuse; print('langfuse ok')"], env);
-}
+function commandOk(cmd, args, env = process.env) {
+  const r = spawnSync(cmd, args, { encoding: "utf8", env });
+  return { ok: !r.error && r.status === 0, detail: (r.stdout || r.stderr || "").trim() };
+}
+
+function isWindowsAppsPath(candidate) {
+  return String(candidate || "").toLowerCase().includes("\\program files\\windowsapps\\");
+}
+
+function readCodexShimTarget(codexHome) {
+  if (process.platform !== "win32") return "";
+  const shimPath = path.join(codexHome, "bin", "codex.cmd");
+  if (!fs.existsSync(shimPath)) return "";
+  const text = stripBom(fs.readFileSync(shimPath, "utf8"));
+  const matches = text.matchAll(/^\s*call\s+"([^"]+)"/gim);
+  for (const match of matches) {
+    const base = path.basename(match[1]).toLowerCase();
+    if (base === "codex.exe" || base === "codex.cmd" || base === "codex") return match[1];
+  }
+  return "";
+}
+
+function venvPython(codexHome) {
+  return process.platform === "win32"
+    ? path.join(codexHome, "langfuse-venv", "Scripts", "python.exe")
+    : path.join(codexHome, "langfuse-venv", "bin", "python");
+}
+
+function fallbackPythonCommand() {
+  return process.platform === "win32" ? "python" : "python3";
+}
+
+function isolatedPythonPath(codexHome) {
+  return path.join(codexHome, "langfuse-python");
+}
+
+function langfuseImportOk(hookPython, fallbackTarget) {
+  if (fs.existsSync(hookPython)) return commandOk(hookPython, ["-c", "import langfuse; print('langfuse ok')"]);
+  const env = { ...process.env, PYTHONPATH: process.env.PYTHONPATH ? `${fallbackTarget}${path.delimiter}${process.env.PYTHONPATH}` : fallbackTarget };
+  return commandOk(fallbackPythonCommand(), ["-c", "import langfuse; print('langfuse ok')"], env);
+}
 
 function configHasNotify(configText) {
   const firstSection = configText.search(/^\s*\[/m);
@@ -98,15 +98,15 @@ function main() {
   const sessionsDir = path.join(codexHome, "sessions");
   const latestSession = findLatestSession(sessionsDir);
   const langfuseConfig = readJsonIfExists(langfuseConfigPath);
-  const configText = fs.existsSync(configPath) ? stripBom(fs.readFileSync(configPath, "utf8")) : "";
-  const hookPython = venvPython(codexHome);
-  const fallbackTarget = isolatedPythonPath(codexHome);
-  const python = commandOk(process.platform === "win32" ? "python" : "python3", ["--version"]);
-  const langfuseImport = langfuseImportOk(hookPython, fallbackTarget);
-  const codexShimTarget = readCodexShimTarget(codexHome);
-  const codexShimUsesWindowsApps = !!codexShimTarget && isWindowsAppsPath(codexShimTarget);
-
-  const logPath = path.join(codexHome, "langfuse", "codex_langfuse_notify.log");
+  const configText = fs.existsSync(configPath) ? stripBom(fs.readFileSync(configPath, "utf8")) : "";
+  const hookPython = venvPython(codexHome);
+  const fallbackTarget = isolatedPythonPath(codexHome);
+  const python = commandOk(process.platform === "win32" ? "python" : "python3", ["--version"]);
+  const langfuseImport = langfuseImportOk(hookPython, fallbackTarget);
+  const codexShimTarget = readCodexShimTarget(codexHome);
+  const codexShimUsesWindowsApps = !!codexShimTarget && isWindowsAppsPath(codexShimTarget);
+
+  const logPath = path.join(codexHome, "langfuse", "codex_langfuse_notify.log");
   const logText = fs.existsSync(logPath) ? stripBom(fs.readFileSync(logPath, "utf8")) : "";
   const recentLogHasError = /Traceback|ERROR|Exception|Failed/i.test(logText.slice(-4000));
 
@@ -145,21 +145,21 @@ function main() {
     "Start a Codex conversation, then check again.",
     { required: false }
   );
-  addResult(results, "Python", python.ok, python.detail || "not found", "Install Python and pip, then rerun setup.");
-  addResult(
-    results,
-    "Codex command shim target",
-    !codexShimUsesWindowsApps,
-    codexShimTarget || "not installed",
-    "Run setup/update again with a fixed oh-langfuse version; WindowsApps Codex paths cannot be called directly."
-  );
-  addResult(
-    results,
-    "Langfuse hook Python",
-    fs.existsSync(hookPython) || fs.existsSync(fallbackTarget),
-    fs.existsSync(hookPython) ? hookPython : `${fallbackPythonCommand()} with PYTHONPATH=${fallbackTarget}`,
-    "Run setup again; on Linux the installer can fall back to an isolated PYTHONPATH target."
-  );
+  addResult(results, "Python", python.ok, python.detail || "not found", "Install Python and pip, then rerun setup.");
+  addResult(
+    results,
+    "Codex command shim target",
+    !codexShimUsesWindowsApps,
+    codexShimTarget || "not installed",
+    "Run setup/update again with a fixed oh-langfuse version; WindowsApps Codex paths cannot be called directly."
+  );
+  addResult(
+    results,
+    "Langfuse hook Python",
+    fs.existsSync(hookPython) || fs.existsSync(fallbackTarget),
+    fs.existsSync(hookPython) ? hookPython : `${fallbackPythonCommand()} with PYTHONPATH=${fallbackTarget}`,
+    "Run setup again; on Linux the installer can fall back to an isolated PYTHONPATH target."
+  );
   addResult(
     results,
     "Python langfuse package",