@osfactory/har 0.31.0 → 0.32.0

package/dist/index.js

@@ -6621,6 +6621,7 @@ var init_control_config = __esm({
 // src/core/otel-hooks.ts
 var otel_hooks_exports = {};
 __export(otel_hooks_exports, {
+  LEGACY_CURSOR_ONLY_HOOK_EVENTS: () => LEGACY_CURSOR_ONLY_HOOK_EVENTS,
   OTEL_HOOKS_AGENTS: () => OTEL_HOOKS_AGENTS,
   OTEL_HOOKS_PACKAGE: () => OTEL_HOOKS_PACKAGE,
   OTEL_HOOKS_PROVIDERS: () => OTEL_HOOKS_PROVIDERS,
@@ -6632,6 +6633,7 @@ __export(otel_hooks_exports, {
   getOtelHooksStateDir: () => getOtelHooksStateDir,
   getOtelHooksWrapperPath: () => getOtelHooksWrapperPath,
   parseResourceAttributesString: () => parseResourceAttributesString,
+  pruneLegacyCursorHookEvents: () => pruneLegacyCursorHookEvents,
   rewriteHookCommandsToWrapper: () => rewriteHookCommandsToWrapper,
   writeOtelHooksConfig: () => writeOtelHooksConfig,
   writeOtelHooksWrapper: () => writeOtelHooksWrapper
@@ -6777,10 +6779,12 @@ function tryInstallPackage(hooksHome) {
     detail: `npm install ${OTEL_HOOKS_PACKAGE} failed: ${(result.stderr || result.stdout || "").trim().slice(0, 400)}`
   };
 }
-function uninstallLegacyPythonHooks() {
+function uninstallLegacyPythonHooks(hooksHome) {
   const attempts = [
     ["uv", ["tool", "uninstall", "opentelemetry-hooks"]],
-    ["pipx", ["uninstall", "opentelemetry-hooks"]]
+    ["pipx", ["uninstall", "opentelemetry-hooks"]],
+    ["pip", ["uninstall", "-y", "opentelemetry-hooks"]],
+    ["pip3", ["uninstall", "-y", "opentelemetry-hooks"]]
   ];
   for (const [cmd, args] of attempts) {
     if (!commandExists2(cmd)) continue;
@@ -6789,6 +6793,31 @@ function uninstallLegacyPythonHooks() {
     } catch {
     }
   }
+  removeLegacyPythonArtifacts(hooksHome);
+}
+function removeLegacyPythonArtifacts(hooksHome) {
+  const legacyPaths = [
+    path45.join(hooksHome, ".venv"),
+    path45.join(hooksHome, "otel_config.yaml"),
+    path45.join(hooksHome, "venv")
+  ];
+  for (const target of legacyPaths) {
+    try {
+      if (fs42.existsSync(target)) {
+        fs42.rmSync(target, { recursive: true, force: true });
+      }
+    } catch {
+    }
+  }
+}
+function isOtelHookCommand(command2, wrapperPath) {
+  if (command2.includes("otel-hook") || command2.includes("otel_hook.py") || command2.includes("opentelemetry-hooks")) {
+    return true;
+  }
+  return wrapperPath !== void 0 && command2.includes(wrapperPath);
+}
+function normalizeLegacyProviderFlagsInCommand(command2) {
+  return command2.replace(/(^|\s)--cursor(?=\s|$)/g, "$1--provider cursor").replace(/(^|\s)--claude(?=\s|$)/g, "$1--provider claude-code").replace(/(^|\s)--codex(?=\s|$)/g, "$1--provider codex");
 }
 function runSetupProvider(providerId, otelHookCommand, wrapperPath) {
   const hookCommand = `${wrapperPath} --provider ${providerId}`;
@@ -6831,18 +6860,21 @@ function rewriteHookCommandsToWrapper(filePath, wrapperPath) {
   }
   if (!parsed || typeof parsed !== "object") return false;
   const rewriteCommand = (command2) => {
-    if (!command2.includes("otel-hook") && !command2.includes("otel_hook.py") && !command2.includes("opentelemetry-hooks")) {
+    if (!isOtelHookCommand(command2, wrapperPath)) {
       return command2;
     }
-    if (command2.includes(wrapperPath)) return command2;
-    const rewritten = command2.replace(
+    const normalized = normalizeLegacyProviderFlagsInCommand(command2);
+    if (command2.includes(wrapperPath)) {
+      return normalized;
+    }
+    const rewritten = normalized.replace(
       /(?:^|[;&|]\s*)(?:env\s+[^=\s]+=\S+\s+)*(?:python3?\s+)?(?:npx\s+)?(?:\S*otel[_-]hook\S*|\S*opentelemetry-hooks\S*)/,
       (match) => match.replace(
         /(?:python3?\s+)?(?:npx\s+)?(?:\S*otel[_-]hook\S*|\S*opentelemetry-hooks\S*)/,
         wrapperPath
       )
     );
-    return rewritten.replace(/(^|\s)--cursor(?=\s|$)/g, "$1--provider cursor").replace(/(^|\s)--claude(?=\s|$)/g, "$1--provider claude-code").replace(/(^|\s)--codex(?=\s|$)/g, "$1--provider codex");
+    return normalizeLegacyProviderFlagsInCommand(rewritten);
   };
   const walk = (node) => {
     let changed = false;
@@ -6867,6 +6899,49 @@ function rewriteHookCommandsToWrapper(filePath, wrapperPath) {
 `);
   return true;
 }
+function pruneLegacyCursorHookEvents(filePath, wrapperPath) {
+  if (!fs42.existsSync(filePath)) return false;
+  let raw;
+  try {
+    raw = fs42.readFileSync(filePath, "utf8");
+  } catch {
+    return false;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return false;
+  }
+  if (!parsed || typeof parsed !== "object") return false;
+  const root = parsed;
+  if (!root.hooks || typeof root.hooks !== "object" || Array.isArray(root.hooks)) {
+    return false;
+  }
+  const hooks = root.hooks;
+  let changed = false;
+  for (const event of LEGACY_CURSOR_ONLY_HOOK_EVENTS) {
+    const list = hooks[event];
+    if (!Array.isArray(list)) continue;
+    const kept = list.filter((entry) => {
+      if (!entry || typeof entry !== "object") return true;
+      const command2 = entry.command;
+      if (typeof command2 !== "string") return true;
+      return !isOtelHookCommand(command2, wrapperPath);
+    });
+    if (kept.length === list.length) continue;
+    changed = true;
+    if (kept.length === 0) {
+      delete hooks[event];
+    } else {
+      hooks[event] = kept;
+    }
+  }
+  if (!changed) return false;
+  fs42.writeFileSync(filePath, `${JSON.stringify(parsed, null, 2)}
+`);
+  return true;
+}
 function rewriteKnownHookRegistrations(wrapperPath) {
   const home = os14.homedir();
   const candidates = [
@@ -6877,6 +6952,9 @@ function rewriteKnownHookRegistrations(wrapperPath) {
   for (const filePath of candidates) {
     try {
       rewriteHookCommandsToWrapper(filePath, wrapperPath);
+      if (filePath.endsWith(`${path45.sep}.cursor${path45.sep}hooks.json`)) {
+        pruneLegacyCursorHookEvents(filePath, wrapperPath);
+      }
     } catch {
     }
   }
@@ -6957,7 +7035,7 @@ function ensureOtelHooks(options) {
     hooksHome
   );
   const wrapperPath = writeOtelHooksWrapper(resolvedCommand, hooksHome);
-  uninstallLegacyPythonHooks();
+  uninstallLegacyPythonHooks(hooksHome);
   if (options?.setupAgents !== false && isTelemetryEnabled()) {
     for (const provider of OTEL_HOOKS_PROVIDERS) {
       const setup = runSetupProvider(provider.id, resolvedCommand, wrapperPath);
@@ -6984,7 +7062,7 @@ function ensureOtelHooks(options) {
 function disableOtelHooksExport() {
   return writeOtelHooksConfig(buildOtelHooksConfig({ enabled: false }));
 }
-var import_child_process10, fs42, os14, path45, OTEL_HOOKS_PACKAGE, OTEL_HOOKS_PROVIDERS, OTEL_HOOKS_AGENTS;
+var import_child_process10, fs42, os14, path45, OTEL_HOOKS_PACKAGE, OTEL_HOOKS_PROVIDERS, OTEL_HOOKS_AGENTS, LEGACY_CURSOR_ONLY_HOOK_EVENTS;
 var init_otel_hooks = __esm({
   "src/core/otel-hooks.ts"() {
     "use strict";
@@ -7001,6 +7079,17 @@ var init_otel_hooks = __esm({
       { id: "codex", label: "codex" }
     ];
     OTEL_HOOKS_AGENTS = ["cursor", "claude", "codex"];
+    LEGACY_CURSOR_ONLY_HOOK_EVENTS = [
+      "afterAgentResponse",
+      "afterAgentThought",
+      "beforeShellExecution",
+      "afterShellExecution",
+      "beforeMCPExecution",
+      "afterMCPExecution",
+      "beforeReadFile",
+      "subagentStart",
+      "subagentStop"
+    ];
   }
 });
 
@@ -37226,13 +37315,13 @@ function usage(yargs, shim3) {
   };
   self.stringifiedValues = function stringifiedValues(values, separator) {
     let string3 = "";
-    const sep6 = separator || ", ";
+    const sep7 = separator || ", ";
     const array2 = [].concat(values);
     if (!values || !array2.length)
       return string3;
     array2.forEach((value) => {
       if (string3.length)
-        string3 += sep6;
+        string3 += sep7;
       string3 += JSON.stringify(value);
     });
     return string3;
@@ -44248,6 +44337,7 @@ var HarnessVerificationResultSchema = external_exports.object({
   status: external_exports.enum(["pass", "fail"]),
   agent_id: external_exports.number().int().min(HAR_AGENT_SLOT_MIN),
   total_ms: external_exports.number().optional(),
+  coverage: external_exports.number().min(0).max(100).optional(),
   stages: external_exports.array(HarnessVerificationStepSchema)
 });
 var HarnessStageRunStatusSchema = external_exports.enum([
@@ -44572,6 +44662,7 @@ var AgentSessionUsageSchema = external_exports.object({
   sessionKey: external_exports.string().min(1),
   agentId: external_exports.number().int().min(HAR_AGENT_SLOT_MIN),
   agentTool: AgentToolSchema,
+  userEmail: external_exports.string().email().optional(),
   workDir: external_exports.string().optional(),
   branch: external_exports.string().optional(),
   suffix: external_exports.string().optional(),
@@ -67894,24 +67985,36 @@ function providerHint(agentTool) {
   if (agentTool === "codex") return "openai";
   return void 0;
 }
+function toGenaiPricesUsage(totals) {
+  const rawInput = num(totals.tokensInput);
+  const cacheRead = num(totals.tokensCacheRead);
+  const cacheWrite = num(totals.tokensCacheCreation);
+  const uncached = rawInput >= cacheRead ? rawInput - cacheRead : rawInput;
+  const inclusiveInput = uncached + cacheRead + cacheWrite;
+  return {
+    input_tokens: inclusiveInput,
+    output_tokens: num(totals.tokensOutput),
+    cache_read_tokens: cacheRead,
+    cache_write_tokens: cacheWrite
+  };
+}
 function pricingModelCandidates(modelId) {
   const out = [modelId];
   if (modelId.startsWith("cursor-")) out.push(modelId.slice("cursor-".length));
   return [...new Set(out)];
 }
 function estimateModelCostUsd(modelId, totals, agentTool) {
-  const usage2 = {
-    input_tokens: num(totals.tokensInput),
-    output_tokens: num(totals.tokensOutput),
-    cache_read_tokens: num(totals.tokensCacheRead),
-    cache_write_tokens: num(totals.tokensCacheCreation)
-  };
-  const tokenSum = usage2.input_tokens + usage2.output_tokens + usage2.cache_read_tokens + usage2.cache_write_tokens;
+  const usage2 = toGenaiPricesUsage(totals);
+  const tokenSum = usage2.input_tokens + usage2.output_tokens;
   if (tokenSum <= 0) return null;
   const providerId = providerHint(agentTool);
   for (const candidate of pricingModelCandidates(modelId)) {
-    const result = ve(usage2, candidate, providerId ? { providerId } : void 0);
-    if (result) return result.total_price;
+    try {
+      const result = ve(usage2, candidate, providerId ? { providerId } : void 0);
+      if (result) return result.total_price;
+    } catch {
+      continue;
+    }
   }
   return null;
 }
@@ -76180,6 +76283,7 @@ async function syncRepoRunsAndSlots(apiUrl, repoId, repoPath, dryRun) {
   }
   if (isTelemetryEnabled() && process.env.NODE_ENV !== "test") {
     try {
+      const userEmail = resolvePortalUserEmail();
       const usage2 = status.slots.flatMap(
         (slot) => harvestUsageForSlot({
           agentId: slot.agentId,
@@ -76198,7 +76302,8 @@ async function syncRepoRunsAndSlots(apiUrl, repoId, repoPath, dryRun) {
             agentId: slot.agentId,
             suffix: slot.suffix,
             createdAt: slot.sessionCreatedAt
-          })
+          }),
+          ...userEmail ? { userEmail } : {}
         }))
       );
       if (usage2.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osfactory/har",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "description": "LLM-powered CLI for reproducible agent development environments",
   "keywords": [
     "har",