@osfactory/har 0.39.0 → 0.40.0

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="logo.png" alt="HAR logo" width="120">
+  <img src="assets/logo.png" alt="HAR logo" width="120">
 </p>
 
 # HAR — Harnesses for coding agents
@@ -68,6 +68,19 @@ Everything beyond install and first commands lives at **[https://harproject.dev/
 
 See [CONTRIBUTING.md](./CONTRIBUTING.md) for local setup, the dogfood harness loop, and architecture. Coding agents working on this repo should start with [AGENT.md](./AGENT.md). Maintainer release process: [RELEASING.md](./RELEASING.md).
 
+## Sponsors
+
+HAR is sponsored by [Kerno](https://kerno.io) — runtime code and security review for coding agents.
+
+<p align="center">
+  <a href="https://kerno.io">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="assets/kerno-logo.svg">
+      <img src="assets/kerno-logo-dark.svg" alt="Kerno" height="36">
+    </picture>
+  </a>
+</p>
+
 ## License
 
 Licensed under the [Apache License 2.0](./LICENSE).

package/dist/index.js

@@ -28533,7 +28533,9 @@ function readPortalCredentials() {
       token: parsed.token,
       workspace: parsed.workspace,
       email: parsed.email,
-      createdAt: parsed.createdAt ?? ""
+      createdAt: parsed.createdAt ?? "",
+      refreshToken: parsed.refreshToken,
+      expiresAt: parsed.expiresAt
     };
   } catch {
     return null;
@@ -28576,7 +28578,11 @@ function getPortalTarget() {
   }
   const stored = readPortalCredentials();
   if (stored) {
-    return { url: normalizeUrl(stored.portalUrl), token: stored.token };
+    return {
+      url: normalizeUrl(stored.portalUrl),
+      token: stored.token,
+      refreshToken: stored.refreshToken
+    };
   }
   if (process.env.HAR_CLOUD_API_URL && process.env.HAR_CLOUD_API_KEY) {
     return {
@@ -30982,6 +30988,25 @@ var init_codex = __esm({
 });
 
 // src/core/usage-harvest/index.ts
+function sessionToolKey(sessionKey, agentTool) {
+  return `${sessionKey}\0${agentTool}`;
+}
+function omitHarvestWhenOtelPresent(harvested, existing) {
+  const otelKeys = new Set(
+    existing.filter((row) => (row.sources ?? []).includes("otel")).map((row) => sessionToolKey(row.sessionKey, row.agentTool))
+  );
+  if (otelKeys.size === 0) return harvested;
+  return harvested.filter((row) => !otelKeys.has(sessionToolKey(row.sessionKey, row.agentTool)));
+}
+function omitHarvestEventsWhenOtelPresent(harvested, existing) {
+  const otelKeys = new Set(
+    existing.filter((event) => event.source === "otel").map((event) => sessionToolKey(event.sessionKey, event.agentTool))
+  );
+  if (otelKeys.size === 0) return harvested;
+  return harvested.filter(
+    (event) => !otelKeys.has(sessionToolKey(event.sessionKey, event.agentTool))
+  );
+}
 function harvestUsageForSlot(slot) {
   const out = [];
   const claude = harvestClaudeUsage(slot);
@@ -31274,9 +31299,8 @@ async function postJson(url, body, dryRun) {
   }
   return await response.json();
 }
-async function postPortal(target, endpoint, body, dryRun) {
-  if (dryRun) return;
-  const response = await fetch(`${target.url}${endpoint}`, {
+function postPortalOnce(target, endpoint, body) {
+  return fetch(`${target.url}${endpoint}`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -31284,10 +31308,38 @@ async function postPortal(target, endpoint, body, dryRun) {
     },
     body: JSON.stringify(body)
   });
+}
+async function refreshPortalToken(target) {
+  if (!target.refreshToken) return false;
+  let response;
+  try {
+    response = await fetch(`${target.url}/api/cli/refresh`, {
+      method: "POST",
+      headers: { Authorization: `Bearer ${target.refreshToken}` }
+    });
+  } catch {
+    return false;
+  }
+  if (!response.ok) return false;
+  const data = await response.json().catch(() => null);
+  if (!data?.token) return false;
+  target.token = data.token;
+  const stored = readPortalCredentials();
+  if (stored) {
+    writePortalCredentials({ ...stored, token: data.token, expiresAt: data.expiresAt });
+  }
+  return true;
+}
+async function postPortal(target, endpoint, body, dryRun) {
+  if (dryRun) return;
+  let response = await postPortalOnce(target, endpoint, body);
+  if ((response.status === 401 || response.status === 403) && await refreshPortalToken(target)) {
+    response = await postPortalOnce(target, endpoint, body);
+  }
   if (!response.ok) {
     if (response.status === 401 || response.status === 403) {
       throw new Error(
-        `har-portal rejected the ingest token (HTTP ${response.status}) \u2014 check HAR_PORTAL_TOKEN.`
+        `har-portal rejected the ingest token (HTTP ${response.status}) \u2014 run \`har control login\` (or check HAR_PORTAL_TOKEN).`
       );
     }
     const text = await response.text().catch(() => "");
@@ -31348,7 +31400,9 @@ async function collectPortalTelemetry(repoPath, slots, controlApiUrl, since) {
       }))
     );
     const persisted = await fetchPersistedPortalTelemetry(repoPath, controlApiUrl, { since });
-    const usage2 = mergePortalUsage(liveUsage, persisted.usage).map((row) => {
+    const harvestedUsage = omitHarvestWhenOtelPresent(liveUsage, persisted.usage);
+    const harvestedEvents = omitHarvestEventsWhenOtelPresent(liveEvents, persisted.events);
+    const usage2 = mergePortalUsage(harvestedUsage, persisted.usage).map((row) => {
       const priced = enrichUsageWithPricing(row);
       const models = modelsFromBreakdown(
         priced.modelBreakdown
@@ -31359,7 +31413,7 @@ async function collectPortalTelemetry(repoPath, slots, controlApiUrl, since) {
         ...models.length > 0 ? { models } : {}
       };
     });
-    const events = dedupePortalEvents(liveEvents, persisted.events).map(
+    const events = dedupePortalEvents(harvestedEvents, persisted.events).map(
       (event) => dropNullFields({ ...event })
     );
     return { usage: usage2, events, maxSyncedAt: persisted.maxSyncedAt };
@@ -81407,6 +81461,8 @@ async function loginViaBrowser(portalUrl, openUrl = openBrowser) {
       const returnedState = requestUrl.searchParams.get("state");
       const workspace = requestUrl.searchParams.get("workspace") ?? void 0;
       const email2 = requestUrl.searchParams.get("email") ?? void 0;
+      const refreshToken = requestUrl.searchParams.get("refreshToken") ?? void 0;
+      const expiresAt = requestUrl.searchParams.get("expiresAt") ?? void 0;
       if (returnedState !== state || !token) {
         res.writeHead(400, { "Content-Type": "text/html" });
         res.end("<h1>Login failed</h1><p>You can close this tab and try again.</p>");
@@ -81417,7 +81473,15 @@ async function loginViaBrowser(portalUrl, openUrl = openBrowser) {
       res.writeHead(200, { "Content-Type": "text/html" });
       res.end("<h1>Logged in</h1><p>You can close this tab and return to the terminal.</p>");
       cleanup();
-      resolve47({ portalUrl, token, workspace, email: email2, createdAt: (/* @__PURE__ */ new Date()).toISOString() });
+      resolve47({
+        portalUrl,
+        token,
+        workspace,
+        email: email2,
+        refreshToken,
+        expiresAt,
+        createdAt: (/* @__PURE__ */ new Date()).toISOString()
+      });
     });
     const cleanup = () => {
       clearTimeout(timer);

package/package.json

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