@ouro.bot/cli 0.1.0-alpha.438 → 0.1.0-alpha.439

package/changelog.json

@@ -1,6 +1,14 @@
 {
   "_note": "This changelog is maintained as part of the PR/version-bump workflow. Agent-curated, not auto-generated. Agents read this file directly via read_file to understand what changed between versions.",
   "versions": [
+    {
+      "version": "0.1.0-alpha.439",
+      "changes": [
+        "When an older Ouro-owned launcher is shadowing the managed `~/.ouro-cli/bin/ouro` path, system setup now repairs it in place instead of dumping a PATH lecture onto the human. Old global Homebrew/npm launchers that clearly belong to Ouro get rewritten to the current managed wrapper automatically.",
+        "That repair is intentionally narrow and truthful: Ouro only rewrites a shadowed launcher when its realpath or readable content proves it is one of our old launchers. Unknown launchers still keep the explicit PATH warning instead of being touched.",
+        "New path-installer and startup output coverage lock in the self-heal path, including readable non-Ouro launchers, disappearing files, write failures, and the happy-path repair of a stale `/opt/homebrew/bin/ouro`, with full coverage, integration, and packaged-install validation on top."
+      ]
+    },
     {
       "version": "0.1.0-alpha.438",
       "changes": [

package/dist/heart/daemon/cli-exec.js

@@ -3262,6 +3262,9 @@ async function performSystemSetup(deps) {
             if (installResult.repairedOldLauncher) {
                 deps.writeStdout("repaired stale ouro launcher at ~/.local/bin/ouro");
             }
+            if (installResult.repairedShadowedLauncherPath) {
+                deps.writeStdout(`updated stale ouro launcher at ${installResult.repairedShadowedLauncherPath}`);
+            }
             if (installResult.pathResolution?.status === "shadowed") {
                 deps.writeStdout(`fix ouro PATH: ${installResult.pathResolution.detail}; ` +
                     `fix: ${installResult.pathResolution.remediation}`);

package/dist/heart/versioning/ouro-path-installer.js

@@ -106,6 +106,72 @@ function isWrapperCurrent(scriptPath, existsSync, readFileSync) {
         return false;
     }
 }
+function isOwnedOuroLauncherPath(resolvedPath) {
+    const normalized = path.normalize(resolvedPath);
+    return (normalized.includes(`${path.sep}node_modules${path.sep}@ouro.bot${path.sep}cli${path.sep}`) ||
+        normalized.includes(`${path.sep}node_modules${path.sep}ouro.bot${path.sep}`));
+}
+function isOwnedOuroLauncherContent(content) {
+    return (content.includes("@ouro.bot/cli") ||
+        content.includes("ouro.bot@latest") ||
+        content.includes('exec npx --yes ouro.bot "$@"') ||
+        content.includes("CurrentVersion/node_modules/@ouro.bot/cli"));
+}
+function canRepairShadowedLauncher(shadowPath, existsSync, readFileSync, realpathSync) {
+    if (!existsSync(shadowPath))
+        return false;
+    try {
+        if (isOwnedOuroLauncherPath(realpathSync(shadowPath)))
+            return true;
+    }
+    catch {
+        // Fall through to content detection below.
+    }
+    try {
+        return isOwnedOuroLauncherContent(readFileSync(shadowPath, "utf-8"));
+    }
+    catch {
+        return false;
+    }
+}
+function repairShadowedLauncher(input) {
+    if (!canRepairShadowedLauncher(input.shadowPath, input.existsSync, input.readFileSync, input.realpathSync)) {
+        return null;
+    }
+    (0, runtime_1.emitNervesEvent)({
+        component: "daemon",
+        event: "daemon.ouro_path_shadow_repair_start",
+        message: "repairing stale shadowed ouro launcher",
+        meta: { shadowPath: input.shadowPath },
+    });
+    try {
+        if (input.lstatSync(input.shadowPath).isSymbolicLink()) {
+            input.unlinkSync(input.shadowPath);
+        }
+        input.writeFileSync(input.shadowPath, WRAPPER_SCRIPT, { mode: 0o755 });
+        input.chmodSync(input.shadowPath, 0o755);
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.ouro_path_shadow_repair_end",
+            message: "repaired stale shadowed ouro launcher",
+            meta: { shadowPath: input.shadowPath },
+        });
+        return input.shadowPath;
+    }
+    catch (error) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "daemon",
+            event: "daemon.ouro_path_shadow_repair_error",
+            message: "failed to repair stale shadowed ouro launcher",
+            meta: {
+                shadowPath: input.shadowPath,
+                error: error instanceof Error ? error.message : String(error),
+            },
+        });
+        return null;
+    }
+}
 function firstOuroOnPath(envPath, existsSync) {
     for (const dir of envPath.split(path.delimiter)) {
         if (!dir)
@@ -166,6 +232,9 @@ function installOuroCommand(deps = {}) {
     const readFileSync = deps.readFileSync ?? ((p, enc) => fs.readFileSync(p, enc));
     const appendFileSync = deps.appendFileSync ?? fs.appendFileSync;
     const chmodSync = deps.chmodSync ?? fs.chmodSync;
+    const realpathSync = deps.realpathSync ?? fs.realpathSync;
+    const lstatSync = deps.lstatSync ?? fs.lstatSync;
+    const unlinkSync = deps.unlinkSync ?? fs.unlinkSync;
     const envPath = deps.envPath ?? process.env.PATH ?? "";
     const shell = deps.shell ?? process.env.SHELL;
     /* v8 ignore stop */
@@ -212,7 +281,22 @@ function installOuroCommand(deps = {}) {
     }
     // ── Fast-path: modern wrapper already current ──
     if (modernCurrent) {
-        const pathResolution = resolvePath();
+        let pathResolution = resolvePath();
+        const repairedShadowedLauncherPath = pathResolution.status === "shadowed" && pathResolution.resolvedPath
+            ? repairShadowedLauncher({
+                shadowPath: pathResolution.resolvedPath,
+                existsSync,
+                readFileSync,
+                writeFileSync,
+                chmodSync,
+                realpathSync,
+                lstatSync,
+                unlinkSync,
+            })
+            : null;
+        if (repairedShadowedLauncherPath) {
+            pathResolution = resolvePath();
+        }
         if (pathResolution.status === "shadowed") {
             (0, runtime_1.emitNervesEvent)({
                 level: "warn",
@@ -228,7 +312,16 @@ function installOuroCommand(deps = {}) {
             message: "ouro command already installed",
             meta: { scriptPath, pathStatus: pathResolution.status, resolvedPath: pathResolution.resolvedPath },
         });
-        return { installed: false, scriptPath, pathReady: isBinDirInPath(binDir, envPath), shellProfileUpdated: null, skippedReason: "already-installed", repairedOldLauncher, pathResolution };
+        return {
+            installed: false,
+            scriptPath,
+            pathReady: isBinDirInPath(binDir, envPath),
+            shellProfileUpdated: null,
+            skippedReason: "already-installed",
+            repairedOldLauncher,
+            repairedShadowedLauncherPath,
+            pathResolution,
+        };
     }
     (0, runtime_1.emitNervesEvent)({
         component: "daemon",
@@ -281,7 +374,22 @@ function installOuroCommand(deps = {}) {
             }
         }
     }
-    const pathResolution = resolvePath();
+    let pathResolution = resolvePath();
+    const repairedShadowedLauncherPath = pathResolution.status === "shadowed" && pathResolution.resolvedPath
+        ? repairShadowedLauncher({
+            shadowPath: pathResolution.resolvedPath,
+            existsSync,
+            readFileSync,
+            writeFileSync,
+            chmodSync,
+            realpathSync,
+            lstatSync,
+            unlinkSync,
+        })
+        : null;
+    if (repairedShadowedLauncherPath) {
+        pathResolution = resolvePath();
+    }
     if (pathResolution.status === "shadowed") {
         (0, runtime_1.emitNervesEvent)({
             level: "warn",
@@ -295,7 +403,23 @@ function installOuroCommand(deps = {}) {
         component: "daemon",
         event: "daemon.ouro_path_install_end",
         message: "ouro command installed",
-        meta: { scriptPath, pathReady, shellProfileUpdated, oldScriptPath: oldExists ? oldScriptPath : null, pathStatus: pathResolution.status, resolvedPath: pathResolution.resolvedPath },
+        meta: {
+            scriptPath,
+            pathReady,
+            shellProfileUpdated,
+            oldScriptPath: oldExists ? oldScriptPath : null,
+            repairedShadowedLauncherPath,
+            pathStatus: pathResolution.status,
+            resolvedPath: pathResolution.resolvedPath,
+        },
     });
-    return { installed: true, scriptPath, pathReady, shellProfileUpdated, repairedOldLauncher, pathResolution };
+    return {
+        installed: true,
+        scriptPath,
+        pathReady,
+        shellProfileUpdated,
+        repairedOldLauncher,
+        repairedShadowedLauncherPath,
+        pathResolution,
+    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.438",
+  "version": "0.1.0-alpha.439",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",