oh-langfuse 0.1.75 → 0.1.77

package/scripts/real-self-verify.mjs

@@ -258,7 +258,7 @@ function basicAuth(publicKey, secretKey) {
   return `Basic ${Buffer.from(`${publicKey}:${secretKey}`, "utf8").toString("base64")}`;
 }
 
-async function langfuseGet(config, pathname, params = {}) {
+async function langfuseGet(config, pathname, params = {}) {
   const url = new URL(`${apiBase(config.baseUrl)}${pathname}`);
   for (const [key, value] of Object.entries(params)) {
     if (value !== undefined && value !== null && String(value) !== "") url.searchParams.set(key, String(value));
@@ -278,17 +278,22 @@ async function langfuseGet(config, pathname, params = {}) {
     error.status = response.status;
     throw error;
   }
-  return await response.json();
-}
-
-async function langfuseGetLenient(config, pathname, params = {}) {
-  try {
-    return await langfuseGet(config, pathname, params);
-  } catch (error) {
-    if (error.status !== 400) throw error;
-    const fallback = {};
-    for (const key of ["limit", "page", "userId", "fields"]) {
-      if (params[key] !== undefined) fallback[key] = params[key];
+  return await response.json();
+}
+
+function isLangfuseQueryShapeError(error) {
+  if (!error) return false;
+  return error.status === 400 || error.status === 422;
+}
+
+async function langfuseGetLenient(config, pathname, params = {}) {
+  try {
+    return await langfuseGet(config, pathname, params);
+  } catch (error) {
+    if (!isLangfuseQueryShapeError(error)) throw error;
+    const fallback = {};
+    for (const key of ["limit", "page", "userId", "fields"]) {
+      if (params[key] !== undefined) fallback[key] = params[key];
     }
     return await langfuseGet(config, pathname, fallback);
   }
@@ -407,18 +412,18 @@ function expectedAgentTurnName(target) {
 async function observationsForTrace(config, traceId, since) {
   if (!traceId) return [];
   const params = { limit: 100, fields: "core,basic,usage", traceId };
-  try {
-    return dataArray(await langfuseGet(config, "/v2/observations", params));
-  } catch (error) {
-    if (error.status !== 400 && error.status !== 404) throw error;
-  }
-  try {
-    return dataArray(await langfuseGet(config, "/observations", { limit: 100, traceId }));
-  } catch (error) {
-    if (error.status !== 400) throw error;
-  }
-  const fallback = dataArray(await langfuseGetLenient(config, "/observations", { limit: 100, fromTimestamp: since.toISOString() }));
-  return fallback.filter((item) => item.traceId === traceId || item.trace_id === traceId);
+  try {
+    return dataArray(await langfuseGet(config, "/v2/observations", params));
+  } catch (error) {
+    if (!isLangfuseQueryShapeError(error) && error.status !== 404) throw error;
+  }
+  try {
+    return dataArray(await langfuseGet(config, "/observations", { limit: 100, traceId }));
+  } catch (error) {
+    if (!isLangfuseQueryShapeError(error)) throw error;
+  }
+  const fallback = dataArray(await langfuseGetLenient(config, "/observations", { limit: 100, fromTimestamp: since.toISOString() }));
+  return fallback.filter((item) => item.traceId === traceId || item.trace_id === traceId);
 }
 
 function mergeMetricCandidates(items) {
@@ -439,12 +444,12 @@ async function recentMetricCandidates(config, since) {
   const candidates = [];
   for (const pathname of ["/traces"]) {
     for (const params of [{ ...baseParams, userId: config.userId }, baseParams]) {
-      try {
-        candidates.push(...dataArray(await langfuseGetLenient(config, pathname, params)));
-      } catch (error) {
-        if (error.name === "AbortError" || error.status === 404) continue;
-        throw error;
-      }
+      try {
+        candidates.push(...dataArray(await langfuseGetLenient(config, pathname, params)));
+      } catch (error) {
+        if (error.name === "AbortError" || error.status === 404 || isLangfuseQueryShapeError(error)) continue;
+        throw error;
+      }
     }
   }
   return mergeMetricCandidates(candidates);
@@ -564,12 +569,12 @@ async function findLangfuseMarker(config, marker, { since, target }) {
 
   for (const params of traceQueries) {
     let traces;
-    try {
-      traces = await langfuseGetLenient(config, "/traces", params);
-    } catch (error) {
-      if (error.status === 404) continue;
-      throw error;
-    }
+    try {
+      traces = await langfuseGetLenient(config, "/traces", params);
+    } catch (error) {
+      if (error.status === 404 || isLangfuseQueryShapeError(error)) continue;
+      throw error;
+    }
     for (const trace of dataArray(traces)) {
       if (containsMarker(trace, marker)) return { kind: "trace-list", target, id: idOf(trace), item: trace };
     }
@@ -597,10 +602,10 @@ async function findLangfuseMarker(config, marker, { since, target }) {
       for (const observation of dataArray(observations)) {
         if (containsMarker(observation, marker)) return { kind: pathname, target, id: idOf(observation), item: observation };
       }
-    } catch (error) {
-      if (error.status === 404 || error.status === 400) continue;
-      throw error;
-    }
+    } catch (error) {
+      if (error.status === 404 || isLangfuseQueryShapeError(error)) continue;
+      throw error;
+    }
   }
 
   return null;

package/scripts/resolve-opencode-cli.mjs

@@ -29,23 +29,27 @@ export function resolveOpencodeCli(preferred) {
   const home = os.homedir();
 
   /** @type {string[]} */
-  const candidates = [];
-  if (process.platform === "win32") {
-    candidates.push(path.join(home, ".opencode", "bin", "opencode.exe"));
-    candidates.push(path.join(home, ".opencode", "bin", "opencode.cmd"));
-    candidates.push(path.join(home, "bin", "opencode.exe"));
-    if (process.env.LOCALAPPDATA) {
-      candidates.push(path.join(process.env.LOCALAPPDATA, "Programs", "opencode", "opencode.exe"));
-    }
+  const candidates = [];
+  if (process.platform === "win32") {
+    candidates.push(path.join(home, ".opencode", "bin", "opencode.exe"));
     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", "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"));
       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"));
+    if (process.env.LOCALAPPDATA) {
+      candidates.push(path.join(process.env.LOCALAPPDATA, "Programs", "opencode", "opencode.exe"));
+    }
+    candidates.push(path.join(home, ".config", "opencode", "bin", "opencode.exe"));
+    candidates.push(path.join(home, ".config", "opencode", "bin", "opencode.cmd"));
+    candidates.push(path.join(home, ".opencode", "bin", "opencode.cmd"));
+    candidates.push(path.join(home, "bin", "opencode.exe"));
+    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(home, "scoop", "shims", "opencode.exe"));
   } else {
     candidates.push(path.join(home, ".opencode", "bin", "opencode"));
     candidates.push(path.join(home, ".local", "bin", "opencode"));