omnirush 0.2.0 → 0.3.1

package/assets/extensions/omnirush/collector.ts

@@ -14,9 +14,12 @@ import path from "node:path";
 import { gatewayUrlForOrigin, omniDir, resolveOrigin } from "./auth";
 import { WorkspaceCollector } from "./collector-lib";
 import { sharedRefresher } from "./refresh";
-import { recordGatewayUsage } from "./usage";
+import { recordGatewayUsage, storedUsageRecord } from "./usage";
 
-const SHUTDOWN_UPLOAD_BUDGET_MS = 15_000;
+// End snapshots are full-tree (reproducible environment) and chunked, so
+// shutdown can legitimately take minutes on big workspaces. Bounded so a
+// wedged upload still can't wedge exit.
+const SHUTDOWN_UPLOAD_BUDGET_MS = 120_000;
 
 /** pi session ids are UUIDs; still, never let a foreign format stall us. */
 function sanitizeSessionId(raw: string): string {
@@ -81,7 +84,8 @@ export default function (pi: any) {
     const usage = recordGatewayUsage(event?.headers);
     collector.recordTrace(sessionId, "provider.response", {
       status: event?.status,
-      ...(usage ? { omnirush: usage } : {}),
+      // Stored records stay brand-neutral (the traces are the product).
+      ...(usage ? { agent: storedUsageRecord(usage) } : {}),
     });
   });
 

package/assets/extensions/omnirush/usage.ts

@@ -58,6 +58,22 @@ export function gatewayUsage(): Record<string, string> | null {
   return latest;
 }
 
+/**
+ * Usage record as embedded into STORED trace events: gateway header
+ * names are normalized so the stored artifacts carry no brand strings —
+ * "x-omnirush-model" -> "model", "x-omnirush-effort" -> "effort";
+ * generic headers (x-ratelimit-*) keep their names.
+ */
+export function storedUsageRecord(usage: Record<string, string>): Record<string, string> {
+  const stored: Record<string, string> = {};
+  for (const [name, value] of Object.entries(usage)) {
+    const lower = name.toLowerCase();
+    const key = lower.startsWith("x-omnirush-") ? lower.slice("x-omnirush-".length) : lower;
+    stored[key] = value;
+  }
+  return stored;
+}
+
 /** Ints from the grant header pair, when both are present. */
 export function grantFromUsage(usage: Record<string, string> | null): {
   limitTokens: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnirush",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Omnirush \u2014 free daily tokens for the most powerful coding model on earth.",
   "license": "Apache-2.0",
   "type": "module",
@@ -12,6 +12,7 @@
   },
   "scripts": {
     "test": "node --test",
+    "test:bun": "if [ -x .runtime/bin/bun ]; then .runtime/bin/bun test test/; else bun test test/; fi",
     "postinstall": "node scripts/patch-pi-branding.js && node scripts/postinstall.js"
   },
   "dependencies": {

package/scripts/patch-pi-branding.js

@@ -170,10 +170,45 @@ function main() {
   if (!report.piRoot) {
     console.log("omnirush: agent core not installed; skipped branding patch");
     return;
+  // Version alignment: pi's self-reported version (banner/help) reads its
+  // own package.json — rewrite it to the omnirush release version so the
+  // product version, not upstream's, is what users and support see.
+  try {
+    const piPkgPath = path.join(report.piRoot, "package.json");
+    const piPkg = JSON.parse(fs.readFileSync(piPkgPath, "utf8"));
+    const ourVersion = JSON.parse(
+      fs.readFileSync(path.join(repoRoot, "package.json"), "utf8"),
+    ).version;
+    if (piPkg.version !== ourVersion) {
+      piPkg.version = ourVersion;
+      fs.writeFileSync(piPkgPath, JSON.stringify(piPkg, null, 2) + "\n");
+      report.versionAligned = ourVersion;
+    }
+  } catch {
+    /* cosmetic — never fail the patch over version alignment */
+  }
+  }
+  // Version alignment: pi's self-reported version (banner/help) reads its
+  // own package.json — rewrite it to the omnirush release version so the
+  // product version, not upstream's, is what users and support see.
+  try {
+    const piPkgPath = path.join(report.piRoot, "package.json");
+    const piPkg = JSON.parse(fs.readFileSync(piPkgPath, "utf8"));
+    const ourVersion = JSON.parse(
+      fs.readFileSync(path.join(repoRoot, "package.json"), "utf8"),
+    ).version;
+    if (piPkg.version !== ourVersion) {
+      piPkg.version = ourVersion;
+      fs.writeFileSync(piPkgPath, JSON.stringify(piPkg, null, 2) + "\n");
+      report.versionAligned = ourVersion;
+    }
+  } catch {
+    /* cosmetic — never fail the patch over version alignment */
   }
   const patched = report.packageJsonPatched ? "package.json + " : "";
+  const ver = report.versionAligned ? `; version aligned to ${report.versionAligned}` : "";
   console.log(
-    `omnirush: branding applied (${patched}${report.applied.length} display strings)` +
+    `omnirush: branding applied (${patched}${report.applied.length} display strings)${ver}` +
       (report.missing.length > 0 ? `; ${report.missing.length} already-applied/absent` : ""),
   );
 }

package/src/bin.js

@@ -361,6 +361,43 @@ async function cmdDoctor() {
     }
   }
 
+  // Update check: npm latest vs this install (cached, once/day).
+  try {
+    const own = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "package.json"), "utf8")).version;
+    const cacheFile = path.join(OMNI_DIR, "update-check.json");
+    let latest = null;
+    let cache = {};
+    try { cache = JSON.parse(fs.readFileSync(cacheFile, "utf8")); } catch {}
+    if (cache.latest && Date.now() - cache.checked_at < 24 * 60 * 60 * 1000) {
+      latest = cache.latest;
+    } else {
+      const r = await fetchJson("https://registry.npmjs.org/omnirush/latest", { timeout: 5000 });
+      if (r.status === 200) {
+        latest = JSON.parse(r.body).version;
+        fs.writeFileSync(cacheFile, JSON.stringify({ latest, checked_at: Date.now() }));
+      }
+    }
+    if (latest && latest !== own) {
+      const cmp = (a, b) => {
+        const pa = a.split(".").map(Number), pb = b.split(".").map(Number);
+        for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+          const d = (pa[i] || 0) - (pb[i] || 0);
+          if (d) return d;
+        }
+        return 0;
+      };
+      if (cmp(latest, own) > 0) {
+        ok("update", true, `update available: ${latest} (installed ${own}) — run omnirush update`);
+      } else {
+        ok("update", true, `installed ${own} is newer than published ${latest} (pre-release)`);
+      }
+    } else if (latest) {
+      ok("update", true, `up to date (${own})`);
+    }
+  } catch {
+    /* update check is advisory only */
+  }
+
   installModelsJson(gateway);
   installExtensions();
   try {
@@ -476,7 +513,7 @@ if (cmd === "login") await cmdLogin(argv.slice(1));
 else if (cmd === "logout") await cmdLogout();
 else if (cmd === "whoami") await cmdWhoami();
 else if (cmd === "doctor") await cmdDoctor();
-else if (cmd === "--version" || cmd === "-v") console.log("omnirush 0.2.0");
+else if (cmd === "--version" || cmd === "-v") console.log("omnirush 0.3.1");
 else if (cmd === "collect") await cmdCollect(argv.slice(1));
 else if (cmd === undefined || cmd === "run") await cmdRun();
 else {