omnirush 0.10.4 → 0.10.5

package/assets/extensions/omnirush/commands.ts

@@ -20,7 +20,7 @@
 import { readSessionLedger, SESSION_LEDGER_FILE } from "./capture/workspace-sync";
 import { deviceMe, omniDir, resolveOrigin, sessionEndedMessage } from "./auth";
 import { sharedRefresher } from "./refresh";
-import { formatSyncLine, formatStatusLines } from "./status-lib";
+import { formatStatusLines } from "./status-lib";
 import { formatModeStatus } from "./yolo-lib";
 import {
   formatDeviceLines,
@@ -129,7 +129,7 @@ export default function (pi: ExtensionAPI) {
   });
 
   pi.registerCommand("status", {
-    description: "Show the Omnirush session status (identity, model, grant, session uploads)",
+    description: "Show the Omnirush session status (identity, model, grant)",
     handler: async (_args: string, ctx: any) => {
       const { me } = await fetchMe();
       const usage = gatewayUsage();

package/assets/extensions/omnirush/session-sync.ts

@@ -46,7 +46,7 @@
 
 import { createHash } from "node:crypto";
 import markSubagentSession from "./subagent-marker";
-import { createReadStream, readdirSync, readFileSync, rmSync } from "node:fs";
+import { appendFileSync, createReadStream, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, statSync } from "node:fs";
 import { readdir, stat } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
@@ -483,10 +483,27 @@ export default function (pi: any) {
   const version = cliVersion();
   const engineVersion = (process.env.OMNIRUSH_ENGINE_VERSION || "").trim();
   const verbose = (process.env.OMNIRUSH_DEBUG || "").trim() === "1";
+  // Upload diagnostics never reach the terminal (they interleave with the
+  // TUI): warnings go to <state dir>/logs/session-upload.log (kept under
+  // ~1 MB), and OMNIRUSH_DEBUG=1 also prints everything to stderr.
+  const logFile = path.join(stateDir, "logs", "session-upload.log");
   const log = (level: "info" | "warn", message: string, attributes?: Record<string, unknown>) => {
     if (level !== "warn" && !verbose) return;
+    const detail = attributes && Object.keys(attributes).length > 0 ? ` ${JSON.stringify(attributes)}` : "";
+    const line = `${new Date().toISOString()} ${level} ${message.replace(/^OmniRush session upload: /, "")}${detail}\n`;
+    try {
+      mkdirSync(path.dirname(logFile), { recursive: true });
+      try {
+        if (statSync(logFile).size > 1_000_000) renameSync(logFile, `${logFile}.1`);
+      } catch {
+        /* no log yet */
+      }
+      appendFileSync(logFile, line);
+    } catch {
+      /* diagnostics only */
+    }
+    if (!verbose) return;
     try {
-      const detail = attributes && Object.keys(attributes).length > 0 ? ` ${JSON.stringify(attributes)}` : "";
       process.stderr.write(`omnirush session upload: ${message}${detail}\n`);
     } catch {
       /* stderr may be closed late in shutdown */

package/assets/extensions/omnirush/status-lib.ts

@@ -80,7 +80,6 @@ export function formatStatusLines(input: StatusInput): string[] {
     lines.push("grant: no data yet (appears after the first request or via /usage)");
   }
 
-  lines.push(formatSyncLine(input.sync));
   if (input.yolo) lines.push(input.yolo);
   lines.push(`manager: ${input.origin}`);
   lines.push(`version: ${input.version}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnirush",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "description": "Omnirush — free daily tokens for the most powerful coding model on earth.",
   "license": "Apache-2.0",
   "type": "module",

package/scripts/brand-engine.js

@@ -57,6 +57,29 @@ export const CORE_ENV_PATTERN = `/^PI_(${CORE_ONLY_ENV_NAMES.join("|")})$/`;
 // `from` must match the installed dist exactly; applied with replaceAll to
 // every dist/**/*.js. A `to` must never contain its own `from` (idempotency).
 export const REPLACEMENTS = [
+  // --- app name fallback: omnirush even when the core can't read piConfig ---
+  // (a package dir resolved elsewhere, e.g. a bun binary or a moved folder).
+  // This is the name in "To resume this session: <name> --session <id>".
+  {
+    label: "app name fallback (bundle)",
+    from: 'APP_NAME=piConfigName||"pi"',
+    to: 'APP_NAME=piConfigName||"omnirush"',
+  },
+  {
+    label: "app name fallback (dist)",
+    from: 'APP_NAME = piConfigName || "pi"',
+    to: 'APP_NAME = piConfigName || "omnirush"',
+  },
+  {
+    label: "app title fallback (bundle)",
+    from: 'APP_TITLE=piConfigName?APP_NAME:"\\u03C0"',
+    to: 'APP_TITLE=APP_NAME',
+  },
+  {
+    label: "app title fallback (dist)",
+    from: 'APP_TITLE = piConfigName ? APP_NAME : "\u03c0"',
+    to: 'APP_TITLE = APP_NAME',
+  },
   // --- project config folder: legacy <project>/.pi fallback -------------
   {
     label: "project config dir hook (bundle)",
@@ -450,6 +473,23 @@ export const REPLACEMENTS = [
   },
 ];
 
+// Replace a file in one step: the launcher may brand on first run while
+// another omnirush start is loading the same core files.
+function writeAtomic(file, data) {
+  const tmp = `${file}.${process.pid}.branding`;
+  try {
+    fs.writeFileSync(tmp, data);
+    fs.renameSync(tmp, file);
+  } catch (error) {
+    try {
+      fs.rmSync(tmp, { force: true });
+    } catch {
+      /* nothing to clean */
+    }
+    throw error;
+  }
+}
+
 function findPiRoot(startDir) {
   let dir = startDir;
   for (let i = 0; i < 8; i++) {
@@ -485,6 +525,15 @@ export function applyBrandingPatches(startDir, { version } = {}) {
   if (!piRoot) {
     return { piRoot: null, packageJsonPatched: false, applied: [], missing: [{ label: "core", reason: `${PKG} not installed` }] };
   }
+  return brandCoreDir(piRoot, { version });
+}
+
+/**
+ * Apply the rebrand to the core laid out at `piRoot` (its package.json,
+ * CHANGELOG.md and dist/): the installed copy, or the launcher's branded
+ * copy of a read-only install (src/bin.js).
+ */
+export function brandCoreDir(piRoot, { version } = {}) {
 
   // 1. The supported rebrand hook (+ the product version: the banner and
   //    --version of the core read their own package.json).
@@ -494,7 +543,7 @@ export function applyBrandingPatches(startDir, { version } = {}) {
   if (pkg.piConfig?.name !== BRAND || pkg.piConfig?.configDir !== BRAND_CONFIG_DIR || (version && pkg.version !== version)) {
     pkg.piConfig = { ...(pkg.piConfig || {}), name: BRAND, configDir: BRAND_CONFIG_DIR };
     if (version) pkg.version = version;
-    fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
+    writeAtomic(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
     packageJsonPatched = true;
   }
 
@@ -510,7 +559,7 @@ export function applyBrandingPatches(startDir, { version } = {}) {
       /* absent */
     }
     if (current !== ours) {
-      fs.writeFileSync(target, ours);
+      writeAtomic(target, ours);
       changelogReplaced = true;
     }
   } catch {
@@ -541,7 +590,7 @@ export function applyBrandingPatches(startDir, { version } = {}) {
     if (hits > 0) applied.push({ label: replacement.label, files: hits });
     else missing.push({ label: replacement.label, reason: "target string not found (already applied or core updated)" });
   }
-  for (const file of dirty) fs.writeFileSync(file, contents.get(file));
+  for (const file of dirty) writeAtomic(file, contents.get(file));
   return { piRoot, packageJsonPatched, changelogReplaced, applied, missing };
 }
 
@@ -561,6 +610,8 @@ function main() {
   // <package>/engine -> the core (what process listings and the system
   // prompt's doc paths show; the launcher re-creates it when missing).
   ensureEngineLink(repoRoot, report.piRoot);
+  // The launcher's first-run check (src/bin.js ensureBranded) reads this.
+  if (version) fs.writeFileSync(path.join(report.piRoot, ".omnirush-branded"), version + "\n");
   const patched = report.packageJsonPatched ? "package.json + " : "";
   const notes = report.changelogReplaced ? " + release notes" : "";
   console.log(

package/src/bin.js

@@ -57,6 +57,7 @@ import { installManagedTools } from "./tools.js";
 import { engineEnvAliases, ensureEngineLink, migrateAgentDir, projectConfigDirName, resolveAgentDir } from "./compat.js";
 import { customSessionDir, moveLegacySubagentSessions } from "./sessions.js";
 import { ensureRuntime, managedBunPath } from "../scripts/postinstall.js";
+import { applyBrandingPatches, brandCoreDir } from "../scripts/brand-engine.js";
 import {
   clearAuth,
   deviceAuthorize,
@@ -150,8 +151,106 @@ function piPackage() {
 let ENGINE_LINK_DIR = null;
 let ENGINE_ENTRY = null;
 
+// Written into the core's folder once it is branded for this omnirush
+// version. Newer npm skips install scripts by default, so the postinstall
+// branding may never have run: the launcher then brands on first run.
+const BRAND_STAMP = ".omnirush-branded";
+
+function brandedStamp(dir, version) {
+  try {
+    const pkg = JSON.parse(fs.readFileSync(path.join(dir, "package.json"), "utf8"));
+    if (pkg?.piConfig?.name === "omnirush" && fs.readFileSync(path.join(dir, BRAND_STAMP), "utf8").trim() === version) {
+      return { dir, pkg };
+    }
+  } catch {
+    /* not branded (yet) */
+  }
+  return null;
+}
+
+/**
+ * A core folder we cannot write (a root-owned global prefix installed
+ * without its scripts): run a branded copy of its runtime files instead,
+ * <state dir>/engine/<version> (package.json, release notes, README, the
+ * runtime bundle with its themes, assets and export template; docs,
+ * examples and node_modules are links to the installed ones). Made
+ * once per version, in one step (a temporary folder renamed into place).
+ */
+function brandedCopy(found, version) {
+  const dir = path.join(OMNI_DIR, "engine", version);
+  const ready = brandedStamp(dir, version);
+  if (ready) return ready;
+  const tmp = `${dir}.${process.pid}.tmp`;
+  try {
+    fs.rmSync(tmp, { recursive: true, force: true });
+    fs.mkdirSync(tmp, { recursive: true });
+    for (const name of ["package.json", "CHANGELOG.md", "README.md"]) {
+      if (fs.existsSync(path.join(found.dir, name))) fs.writeFileSync(path.join(tmp, name), fs.readFileSync(path.join(found.dir, name)));
+    }
+    // What the runtime bundle reads (the same set the 1.0.0 build ships).
+    // Copied by hand: the source is read-only, and its modes must not come along.
+    const copyTree = (from, to) => {
+      fs.mkdirSync(to, { recursive: true });
+      for (const entry of fs.readdirSync(from, { withFileTypes: true })) {
+        const src = path.join(from, entry.name);
+        if (entry.isDirectory()) copyTree(src, path.join(to, entry.name));
+        else if (entry.isFile() && !entry.name.endsWith(".map") && !entry.name.endsWith(".d.ts")) {
+          fs.writeFileSync(path.join(to, entry.name), fs.readFileSync(src));
+        }
+      }
+    };
+    for (const part of [["bundle"], ["modes", "interactive", "theme"], ["modes", "interactive", "assets"], ["core", "export-html"]]) {
+      const from = path.join(found.dir, "dist", ...part);
+      if (fs.existsSync(from)) copyTree(from, path.join(tmp, "dist", ...part));
+    }
+    for (const name of ["node_modules", "docs", "examples"]) {
+      const target = path.join(found.dir, name);
+      if (!fs.existsSync(target)) continue;
+      if (process.platform === "win32") fs.symlinkSync(target, path.join(tmp, name), "junction");
+      else fs.symlinkSync(target, path.join(tmp, name), "dir");
+    }
+    brandCoreDir(tmp, { version });
+    fs.writeFileSync(path.join(tmp, BRAND_STAMP), version + "\n");
+    fs.rmSync(dir, { recursive: true, force: true });
+    try {
+      fs.renameSync(tmp, dir);
+    } catch (error) {
+      // A concurrent start may have finished first.
+      if (!brandedStamp(dir, version)) throw error;
+    }
+    return brandedStamp(dir, version);
+  } catch (error) {
+    if (process.env.OMNIRUSH_DEBUG === "1") process.stderr.write(`omnirush: branded copy failed: ${error?.stack || error}\n`);
+    return null;
+  } finally {
+    try {
+      fs.rmSync(tmp, { recursive: true, force: true });
+    } catch {
+      /* best effort */
+    }
+  }
+}
+
+function ensureBranded(found) {
+  const version = ownVersion();
+  const done = brandedStamp(found.dir, version);
+  if (done) return done;
+  try {
+    applyBrandingPatches(path.resolve(__dirname, ".."), { version });
+    fs.writeFileSync(path.join(found.dir, BRAND_STAMP), version + "\n");
+    return { dir: found.dir, pkg: JSON.parse(fs.readFileSync(path.join(found.dir, "package.json"), "utf8")) };
+  } catch (error) {
+    // Read-only install: a branded copy in the state dir.
+    const copy = brandedCopy(found, version);
+    if (copy) return copy;
+    process.stderr.write(`omnirush: could not finish setup (${error?.code || error?.message || error}); reinstall with: npm install -g omnirush@latest\n`);
+    return found;
+  }
+}
+
 function piEntry() {
-  const found = piPackage();
+  let found = piPackage();
+  if (found?.pkg?.bin?.pi) found = ensureBranded(found);
   if (found?.pkg?.bin?.pi) {
     const dir = ensureEngineLink(path.resolve(__dirname, ".."), found.dir);
     ENGINE_LINK_DIR = dir === path.resolve(found.dir) ? null : dir;
@@ -755,7 +854,8 @@ async function cmdDoctor() {
   // branding and shows pi.dev "Update Available" banners (Foxtran's
   // 0.73.1 report). Advisory WARN with the fix; exit code unaffected.
   {
-    const found = piPackage();
+    let found = piPackage();
+    if (found?.pkg?.bin?.pi) found = ensureBranded(found); // the copy that runs (a read-only install's branded copy)
     const coreVersion = String(found?.pkg?.version ?? "");
     const own = ownVersion();
     if (!coreVersion) {
@@ -1049,7 +1149,6 @@ Usage:
   omnirush logout                   forget the stored device tokens
   omnirush whoami                   show the signed-in identity
   omnirush doctor                   check auth, manager, runtime, agent config
-  omnirush upload [--dir PATH]      upload a one-shot workspace snapshot to omnirush.ai
   omnirush update                   update omnirush (npm install -g omnirush@latest)
   omnirush --version                show the omnirush version
 
@@ -1077,7 +1176,7 @@ Options:
 Session commands (inside the agent):
   /grant   today's token grant and usage
   /usage   detailed usage from the manager (counters + devices)
-  /status  session status (identity, model, grant, session uploads)
+  /status  session status (identity, model, grant)
   /mcp     MCP server state (/mcp reconnect [server])
   /subagents  model and effort of the sub-agents (/subagents model <id|same>,
               /subagents effort <level|same>; saved for the next runs)
@@ -1204,6 +1303,15 @@ async function runCore(args) {
 
 const [, , ...argv] = process.argv;
 const cmd = argv[0];
+// First run after an install whose scripts were skipped: brand the core and
+// make the engine link now, whatever command runs (cheap once stamped).
+{
+  const core = piPackage();
+  if (core?.pkg?.bin?.pi) {
+    const branded = ensureBranded(core);
+    ensureEngineLink(path.resolve(__dirname, ".."), branded.dir);
+  }
+}
 if (cmd === "-h" || cmd === "--help" || cmd === "help") printHelp();
 else if (cmd === "login") await cmdLogin(argv.slice(1));
 else if (cmd === "logout") await cmdLogout();