@ouro.bot/cli 0.1.0-alpha.340 → 0.1.0-alpha.341

package/changelog.json

@@ -1,6 +1,12 @@
 {
   "_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.341",
+      "changes": [
+        "`ouro up` and `ouro doctor` now detect when PATH resolves `ouro` to a stale external launcher before the managed `~/.ouro-cli/bin/ouro` wrapper, then print exact path-specific remediation instead of leaving users stuck on an older shim."
+      ]
+    },
     {
       "version": "0.1.0-alpha.340",
       "changes": [

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

@@ -485,6 +485,10 @@ async function performSystemSetup(deps) {
             if (installResult.repairedOldLauncher) {
                 deps.writeStdout("repaired stale ouro launcher at ~/.local/bin/ouro");
             }
+            if (installResult.pathResolution?.status === "shadowed") {
+                deps.writeStdout(`fix ouro PATH: ${installResult.pathResolution.detail}; ` +
+                    `fix: ${installResult.pathResolution.remediation}`);
+            }
         }
         catch (error) {
             (0, runtime_1.emitNervesEvent)({
@@ -2252,6 +2256,7 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
             bundlesRoot: deps.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)(),
             secretsRoot: deps.secretsRoot ?? path.join(os.homedir(), ".agentsecrets"),
             homedir: os.homedir(),
+            envPath: process.env.PATH ?? "",
         };
         const doctorResult = await (0, doctor_1.runDoctorChecks)(doctorDeps);
         const output = (0, cli_render_doctor_1.formatDoctorOutput)(doctorResult);

package/dist/heart/daemon/doctor.js

@@ -7,6 +7,7 @@
  * "fail" check and the remaining categories still run.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkCliPath = checkCliPath;
 exports.checkDaemon = checkDaemon;
 exports.checkAgents = checkAgents;
 exports.checkSenses = checkSenses;
@@ -16,8 +17,32 @@ exports.checkDisk = checkDisk;
 exports.runDoctorChecks = runDoctorChecks;
 const runtime_1 = require("../../nerves/runtime");
 const bluebubbles_health_diagnostics_1 = require("./bluebubbles-health-diagnostics");
+const ouro_path_installer_1 = require("../versioning/ouro-path-installer");
 const DEFAULT_BLUEBUBBLES_REQUEST_TIMEOUT_MS = 30_000;
 // ── Category checkers ──
+function checkCliPath(deps) {
+    const resolution = (0, ouro_path_installer_1.diagnoseOuroPath)({
+        homeDir: deps.homedir,
+        envPath: deps.envPath ?? "",
+        existsSync: deps.existsSync,
+        readFileSync: (p) => deps.readFileSync(p),
+    });
+    const status = resolution.status === "ok"
+        ? "pass"
+        : resolution.status === "shadowed"
+            ? "fail"
+            : "warn";
+    return {
+        name: "CLI",
+        checks: [{
+                label: "ouro PATH resolution",
+                status,
+                detail: resolution.remediation
+                    ? `${resolution.detail}; fix: ${resolution.remediation}`
+                    : resolution.detail,
+            }],
+    };
+}
 async function checkDaemon(deps) {
     const checks = [];
     const socketExists = deps.existsSync(deps.socketPath);
@@ -365,6 +390,7 @@ function computeSummary(categories) {
     return { passed, warnings, failed };
 }
 const CATEGORY_CHECKERS = [
+    { name: "CLI", fn: checkCliPath },
     { name: "Daemon", fn: checkDaemon },
     { name: "Agents", fn: checkAgents },
     { name: "Senses", fn: checkSenses },

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

@@ -33,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.diagnoseOuroPath = diagnoseOuroPath;
 exports.installOuroCommand = installOuroCommand;
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
@@ -80,6 +81,9 @@ function detectShellProfile(homeDir, shell) {
 function isBinDirInPath(binDir, envPath) {
     return envPath.split(path.delimiter).some((p) => p === binDir);
 }
+function samePath(a, b) {
+    return path.resolve(a) === path.resolve(b);
+}
 function buildPathExportLine(binDir, shell) {
     const base = shell ? path.basename(shell) : /* v8 ignore next -- unreachable: only called when detectShellProfile returns non-null, which requires shell @preserve */ "";
     if (base === "fish") {
@@ -97,6 +101,56 @@ function isWrapperCurrent(scriptPath, existsSync, readFileSync) {
         return false;
     }
 }
+function firstOuroOnPath(envPath, existsSync) {
+    for (const dir of envPath.split(path.delimiter)) {
+        if (!dir)
+            continue;
+        const candidate = path.join(dir, "ouro");
+        if (existsSync(candidate))
+            return candidate;
+    }
+    return null;
+}
+function diagnoseOuroPath(deps) {
+    const binDir = path.join(deps.homeDir, ".ouro-cli", "bin");
+    const expectedPath = path.join(binDir, "ouro");
+    const resolvedPath = firstOuroOnPath(deps.envPath, deps.existsSync);
+    if (!resolvedPath) {
+        return {
+            status: "missing",
+            expectedPath,
+            resolvedPath: null,
+            detail: `PATH does not resolve ouro; expected ${expectedPath}`,
+            remediation: `add ${binDir} to PATH or open a new shell after ouro up updates your shell profile`,
+        };
+    }
+    if (samePath(resolvedPath, expectedPath)) {
+        return {
+            status: "ok",
+            expectedPath,
+            resolvedPath,
+            detail: `PATH resolves ouro to ${expectedPath}`,
+            remediation: null,
+        };
+    }
+    if (isWrapperCurrent(resolvedPath, deps.existsSync, deps.readFileSync)) {
+        return {
+            status: "ok",
+            expectedPath,
+            resolvedPath,
+            detail: `PATH resolves ouro through a compatible wrapper at ${resolvedPath}`,
+            remediation: null,
+        };
+    }
+    const shadowDir = path.dirname(resolvedPath);
+    return {
+        status: "shadowed",
+        expectedPath,
+        resolvedPath,
+        detail: `PATH resolves ouro to ${resolvedPath} before ${expectedPath}`,
+        remediation: `move ${binDir} before ${shadowDir} in PATH, or remove/replace ${resolvedPath} after confirming it is the stale ouro launcher`,
+    };
+}
 function installOuroCommand(deps = {}) {
     /* v8 ignore start -- dep defaults: only used in real runtime, tests always inject @preserve */
     const platform = deps.platform ?? process.platform;
@@ -126,6 +180,7 @@ function installOuroCommand(deps = {}) {
     const binDir = path.join(homeDir, ".ouro-cli", "bin");
     const scriptPath = path.join(binDir, "ouro");
     const oldScriptPath = path.join(homeDir, ".local", "bin", "ouro");
+    const resolvePath = () => diagnoseOuroPath({ homeDir, envPath, existsSync, readFileSync });
     const modernCurrent = isWrapperCurrent(scriptPath, existsSync, readFileSync);
     const oldExists = existsSync(oldScriptPath);
     const oldCurrent = oldExists && isWrapperCurrent(oldScriptPath, existsSync, readFileSync);
@@ -152,13 +207,23 @@ function installOuroCommand(deps = {}) {
     }
     // ── Fast-path: modern wrapper already current ──
     if (modernCurrent) {
+        const pathResolution = resolvePath();
+        if (pathResolution.status === "shadowed") {
+            (0, runtime_1.emitNervesEvent)({
+                level: "warn",
+                component: "daemon",
+                event: "daemon.ouro_path_shadowed",
+                message: "PATH resolves ouro to a stale external launcher",
+                meta: { resolvedPath: pathResolution.resolvedPath, expectedPath: pathResolution.expectedPath, remediation: pathResolution.remediation },
+            });
+        }
         (0, runtime_1.emitNervesEvent)({
             component: "daemon",
             event: "daemon.ouro_path_install_skip",
             message: "ouro command already installed",
-            meta: { scriptPath },
+            meta: { scriptPath, pathStatus: pathResolution.status, resolvedPath: pathResolution.resolvedPath },
         });
-        return { installed: false, scriptPath, pathReady: isBinDirInPath(binDir, envPath), shellProfileUpdated: null, skippedReason: "already-installed", repairedOldLauncher };
+        return { installed: false, scriptPath, pathReady: isBinDirInPath(binDir, envPath), shellProfileUpdated: null, skippedReason: "already-installed", repairedOldLauncher, pathResolution };
     }
     (0, runtime_1.emitNervesEvent)({
         component: "daemon",
@@ -211,11 +276,21 @@ function installOuroCommand(deps = {}) {
             }
         }
     }
+    const pathResolution = resolvePath();
+    if (pathResolution.status === "shadowed") {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "daemon",
+            event: "daemon.ouro_path_shadowed",
+            message: "PATH resolves ouro to a stale external launcher",
+            meta: { resolvedPath: pathResolution.resolvedPath, expectedPath: pathResolution.expectedPath, remediation: pathResolution.remediation },
+        });
+    }
     (0, runtime_1.emitNervesEvent)({
         component: "daemon",
         event: "daemon.ouro_path_install_end",
         message: "ouro command installed",
-        meta: { scriptPath, pathReady, shellProfileUpdated, oldScriptPath: oldExists ? oldScriptPath : null },
+        meta: { scriptPath, pathReady, shellProfileUpdated, oldScriptPath: oldExists ? oldScriptPath : null, pathStatus: pathResolution.status, resolvedPath: pathResolution.resolvedPath },
     });
-    return { installed: true, scriptPath, pathReady, shellProfileUpdated, repairedOldLauncher };
+    return { installed: true, scriptPath, pathReady, shellProfileUpdated, repairedOldLauncher, pathResolution };
 }

package/package.json

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