agent-yes 1.121.0 → 1.122.0

package/ts/tray.ts

@@ -60,15 +60,6 @@ function isTrayProcessRunning(pid: number): boolean {
   }
 }
 
-/**
- * Write the current process PID to the tray PID file
- */
-async function writeTrayPid(): Promise<void> {
-  const dir = getTrayDir();
-  await mkdir(dir, { recursive: true });
-  await writeFile(getTrayPidFile(), String(process.pid), "utf8");
-}
-
 /**
  * Remove the tray PID file
  */
@@ -80,6 +71,28 @@ async function removeTrayPid(): Promise<void> {
   }
 }
 
+/**
+ * Atomically claim the tray singleton. Exclusive create (flag "wx") fails if a
+ * pidfile already exists, so two trays racing startup can't BOTH pass a
+ * check-then-act and survive (that race is how N agents ended up with N trays).
+ * If an existing pidfile belongs to a DEAD tray it's stale — take it over.
+ * Returns true if this process is now the singleton owner.
+ */
+async function claimTraySingleton(): Promise<boolean> {
+  const pidFile = getTrayPidFile();
+  await mkdir(getTrayDir(), { recursive: true });
+  for (let attempt = 0; attempt < 2; attempt++) {
+    try {
+      await writeFile(pidFile, String(process.pid), { flag: "wx" });
+      return true; // won the exclusive create
+    } catch {
+      if (await isTrayRunning()) return false; // a live tray owns it
+      await removeTrayPid(); // stale pidfile from a dead tray — drop and retry
+    }
+  }
+  return false;
+}
+
 /**
  * Check if a tray process is already running
  */
@@ -102,6 +115,11 @@ export async function isTrayRunning(): Promise<boolean> {
  */
 export async function ensureTray(): Promise<void> {
   if (!isDesktopOS()) return;
+  // OPT-IN: the systray2 helper busy-loops at ~100% CPU under Bun (its stdio
+  // read loop spins), and every TS-runtime agent calls this — so N concurrent
+  // agents used to each spawn a tray and pin N cores. Auto-spawn is disabled by
+  // default until the busy-loop is fixed; set AGENT_YES_TRAY=1 to opt in.
+  if (process.env.AGENT_YES_TRAY !== "1") return;
   if (await isTrayRunning()) return;
 
   try {
@@ -127,15 +145,13 @@ export async function startTray(): Promise<void> {
     return;
   }
 
-  // Check if another tray is already running
-  if (await isTrayRunning()) {
+  // Atomically claim the singleton (exclusive create) — prevents the
+  // check-then-act race that let concurrent agents each keep a tray alive.
+  if (!(await claimTraySingleton())) {
     console.error("Tray is already running.");
     return;
   }
 
-  // Register our PID
-  await writeTrayPid();
-
   let SysTray: typeof import("systray2").default;
   try {
     SysTray = (await import("systray2")).default;

package/ts/versionChecker.ts

@@ -237,44 +237,41 @@ export function compareVersions(v1: string, v2: string): number {
 
 /**
  * Detect how agent-yes was installed.
- * Returns a short label: "git", "bun link", "bun", "npm", "npx", or "unknown"
+ * Returns a short label: "git", "bun", "npm", "npx", "source", or "unknown".
+ * A bun-link of a git checkout reports "git" (it runs the working tree).
  */
 export function detectInstallMethod(): string {
   try {
-    // Check if running from a file path outside node_modules (git clone / bun link dev)
-    const scriptDir = path.dirname(new URL(import.meta.url).pathname);
-
-    if (!scriptDir.includes("node_modules")) {
-      // Running directly from source — is this a git repo?
-      const repoRoot = path.resolve(scriptDir, "..");
-      if (existsSync(path.join(repoRoot, ".git"))) {
-        return "git";
-      }
-      return "source";
+    // fileURLToPath handles Windows drive letters correctly; new URL().pathname
+    // yields "/C:/…", which breaks existsSync and the substring checks below.
+    const scriptDir = path.dirname(fileURLToPath(import.meta.url));
+    const norm = scriptDir.replace(/\\/g, "/");
+    const hasGit = (dir: string) => existsSync(path.join(dir, ".git"));
+
+    if (!norm.includes("node_modules")) {
+      // Running directly from a checkout (git clone, or a resolved bun-link).
+      return hasGit(path.resolve(scriptDir, "..")) ? "git" : "source";
     }
 
-    // Check if the node_modules entry is a symlink (bun link)
-    const nodeModulesEntry = scriptDir.replace(/\/dist$/, "");
+    // Inside node_modules: a bun-link symlink points back at the local repo.
+    const nodeModulesEntry = scriptDir.replace(/[\\/]dist$/, "");
     try {
-      const stat = lstatSync(nodeModulesEntry);
-      if (stat.isSymbolicLink()) {
-        const target = readlinkSync(nodeModulesEntry);
-        // bun link creates a symlink to the local repo
-        const resolvedTarget = path.resolve(path.dirname(nodeModulesEntry), target);
-        if (existsSync(path.join(resolvedTarget, ".git"))) {
-          return "bun link (git)";
-        }
-        return "bun link";
+      if (lstatSync(nodeModulesEntry).isSymbolicLink()) {
+        const resolved = path.resolve(
+          path.dirname(nodeModulesEntry),
+          readlinkSync(nodeModulesEntry),
+        );
+        return hasGit(resolved) ? "git" : "bun";
       }
     } catch {
-      // not a symlink, continue
+      // not a symlink — fall through to package-manager detection
     }
 
-    // Detect package manager from path or env
-    if (scriptDir.includes(".bun/")) return "bun";
-    if (scriptDir.includes(".npm/")) return "npx";
-    if (process.env.npm_execpath?.includes("bun")) return "bun";
+    // A real package install — figure out the manager.
+    if (norm.includes("/.bun/")) return "bun";
+    if (norm.includes("/.npm/")) return "npx";
     if (process.env.npm_config_user_agent?.startsWith("bun")) return "bun";
+    if (process.env.npm_execpath?.includes("bun")) return "bun";
     if (process.env.npm_config_user_agent?.startsWith("npm")) return "npm";
 
     return "npm";

package/dist/SUPPORTED_CLIS-CegJgoEf.js

@@ -1,8 +0,0 @@
-import "./ts-D91dm1E0.js";
-import "./logger-B9h0djqx.js";
-import "./versionChecker-CAtpgnoQ.js";
-import "./pidStore-B5vBu8Px.js";
-import "./globalPidIndex-gZuTvTBs.js";
-import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-O57LGUEG.js";
-
-export { SUPPORTED_CLIS };