@yagni-app/code-staging 1.0.5-staging.1233.1 → 1.0.5-staging.1234.1

package/dist/upgrade.d.ts

@@ -16,7 +16,9 @@
  */
 export declare const PACKAGE_NAME: string;
 export declare const UPDATE_CHECK_DISABLE_ENV = "YAGNI_DISABLE_UPDATE_CHECK";
-export type InstallMethod = "npm" | "pnpm" | "bun";
+export type InstallMethod = "npm" | "pnpm" | "bun" | "brew";
+/** Fully qualified so `brew upgrade` can never resolve someone else's `yagni`. */
+export declare const BREW_FORMULA = "yagni-app/tap/yagni";
 /**
  * The CLI's own version, read from this package's package.json. Resolved
  * relative to the module (src/ and dist/ both sit one level below the package
@@ -70,8 +72,15 @@ export declare function maybeNudgeAndRefresh(deps: NudgeDeps): Promise<{
 }>;
 /**
  * Which global installer owns the running bin, from its (real) path. The
- * heuristic covers the three installers the package supports; `--method` is
+ * heuristic covers the four installers the package supports; `--method` is
  * the escape hatch when a layout defeats it.
+ *
+ * The path is realpath'd first because Homebrew is invisible in argv[1]:
+ * `/opt/homebrew/bin/yagni` is a symlink chain into the Cellar, and only the
+ * resolved path contains the `/Cellar/` segment (macOS, Intel /usr/local,
+ * and Linuxbrew all share it). Detecting brew matters: running `npm install
+ * -g` over a brew install creates a shadowing parallel copy — or the exact
+ * managed-Mac EACCES the brew channel exists to avoid.
  */
 export declare function detectInstallMethod(binPath: string): InstallMethod;
 export type ParsedUpgradeArgs = {

package/dist/upgrade.js

@@ -15,7 +15,7 @@
  * `yagni upgrade` still works there.
  */
 import { spawn } from "node:child_process";
-import { readFileSync } from "node:fs";
+import { readFileSync, realpathSync } from "node:fs";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -26,7 +26,9 @@ export const UPDATE_CHECK_DISABLE_ENV = "YAGNI_DISABLE_UPDATE_CHECK";
 const DEFAULT_REGISTRY = "https://registry.npmjs.org";
 const FETCH_TIMEOUT_MS = 5_000;
 const SEMVER_RE = /^(0|[1-9]\d{0,5})\.(0|[1-9]\d{0,5})\.(0|[1-9]\d{0,5})(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$/;
-const INSTALL_METHODS = ["npm", "pnpm", "bun"];
+const INSTALL_METHODS = ["npm", "pnpm", "bun", "brew"];
+/** Fully qualified so `brew upgrade` can never resolve someone else's `yagni`. */
+export const BREW_FORMULA = "yagni-app/tap/yagni";
 /**
  * The CLI's own version, read from this package's package.json. Resolved
  * relative to the module (src/ and dist/ both sit one level below the package
@@ -188,18 +190,34 @@ export async function maybeNudgeAndRefresh(deps) {
 // ── `yagni upgrade` ─────────────────────────────────────────────────────────
 /**
  * Which global installer owns the running bin, from its (real) path. The
- * heuristic covers the three installers the package supports; `--method` is
+ * heuristic covers the four installers the package supports; `--method` is
  * the escape hatch when a layout defeats it.
+ *
+ * The path is realpath'd first because Homebrew is invisible in argv[1]:
+ * `/opt/homebrew/bin/yagni` is a symlink chain into the Cellar, and only the
+ * resolved path contains the `/Cellar/` segment (macOS, Intel /usr/local,
+ * and Linuxbrew all share it). Detecting brew matters: running `npm install
+ * -g` over a brew install creates a shadowing parallel copy — or the exact
+ * managed-Mac EACCES the brew channel exists to avoid.
  */
 export function detectInstallMethod(binPath) {
-    const normalized = binPath.replaceAll("\\", "/").toLowerCase();
+    let resolved = binPath;
+    try {
+        resolved = realpathSync(binPath);
+    }
+    catch {
+        // Nonexistent or unreadable (tests, exotic layouts): judge the raw path.
+    }
+    const normalized = resolved.replaceAll("\\", "/").toLowerCase();
+    if (normalized.includes("/cellar/"))
+        return "brew";
     if (normalized.includes("/.bun/"))
         return "bun";
     if (normalized.includes("pnpm"))
         return "pnpm";
     return "npm";
 }
-const UPGRADE_USAGE = `Usage: ${DISTRIBUTION.commandName} upgrade [version] [--method npm|pnpm|bun]`;
+const UPGRADE_USAGE = `Usage: ${DISTRIBUTION.commandName} upgrade [version] [--method npm|pnpm|bun|brew]`;
 export function parseUpgradeArgs(args) {
     let target;
     let method;
@@ -232,9 +250,22 @@ export function parseUpgradeArgs(args) {
     return { ok: true, target, method };
 }
 function installArgv(method, target) {
+    // brew upgrades to whatever the tap formula publishes; it cannot pin a
+    // version, so `target` only tells us an upgrade is worthwhile.
+    if (method === "brew")
+        return ["upgrade", BREW_FORMULA];
     const spec = `${PACKAGE_NAME}@${target}`;
     return method === "npm" ? ["install", "-g", spec] : ["add", "-g", spec];
 }
+function failureHint(method) {
+    if (method === "brew") {
+        return `Try \`brew update\` and \`brew reinstall ${BREW_FORMULA}\`, or \`brew doctor\` if that fails too.`;
+    }
+    // Never suggest sudo: on managed machines the fix is a user-writable
+    // prefix, which the installer sets up automatically.
+    return ("If it was a permissions error, the installer repairs the global prefix without sudo: " +
+        "curl -fsSL https://yagni.app/install.sh | sh");
+}
 function defaultRunInstall(command, args) {
     return new Promise((resolve) => {
         // npm/pnpm/bun are .cmd shims on Windows; a shell is required to run them.
@@ -256,6 +287,11 @@ export async function upgradeCommand(args, deps) {
     }
     const env = deps.env ?? process.env;
     const method = parsed.method ?? detectInstallMethod(deps.binPath ?? process.argv[1] ?? "");
+    if (method === "brew" && parsed.target !== undefined) {
+        logError("Homebrew installs track the tap formula and cannot pin a version. " +
+            `Run \`${DISTRIBUTION.commandName} upgrade\` for the newest release.`);
+        return 1;
+    }
     const fetchLatest = deps.fetchLatest ?? (() => fetchLatestVersion({ env }));
     const target = parsed.target ?? (await fetchLatest());
     if (!target) {
@@ -272,13 +308,17 @@ export async function upgradeCommand(args, deps) {
     const runInstall = deps.runInstall ?? defaultRunInstall;
     const code = await runInstall(method, installArgv(method, target));
     if (code !== 0) {
-        logError(`Upgrade failed (${method} exited ${code}). ` +
-            `If it was a permissions error, fix your ${method} global prefix or retry with elevated permissions.`);
+        logError(`Upgrade failed (${method} exited ${code}). ${failureHint(method)}`);
         return 1;
     }
     // Keep the nudge honest: the freshly installed version is the known latest.
     await writeUpdateCache(target).catch(() => undefined);
-    log(`${DISTRIBUTION.displayName} ${target} installed. Run \`${DISTRIBUTION.commandName} version\` to confirm.`);
+    // brew lands on whatever the formula publishes, which can trail the
+    // registry briefly, so only the package managers that pin get the
+    // version-specific claim.
+    log(method === "brew"
+        ? `${DISTRIBUTION.displayName} upgraded via Homebrew. Run \`${DISTRIBUTION.commandName} version\` to confirm.`
+        : `${DISTRIBUTION.displayName} ${target} installed. Run \`${DISTRIBUTION.commandName} version\` to confirm.`);
     return 0;
 }
 //# sourceMappingURL=upgrade.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yagni-app/code-staging",
-  "version": "1.0.5-staging.1233.1",
+  "version": "1.0.5-staging.1234.1",
   "description": "YAGNI Code: a terminal coding agent that already knows your company. One YAGNI login routes the model and grounds the agent in your team's context.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "YAGNI, Inc. <jack@yagni.app> (https://yagni.app)",
@@ -41,5 +41,5 @@
     "turndown": "^7.2.4",
     "typebox": "^1.3.15"
   },
-  "yagniSourceSha": "5bd359dcd98d8104d425f698a65ed60d780df0af"
+  "yagniSourceSha": "8e2d5ff11858a49f92fc3d4a1e938723d5f9dc91"
 }