@ouro.bot/cli 0.1.0-alpha.110 → 0.1.0-alpha.112

package/changelog.json

@@ -1,6 +1,18 @@
 {
   "_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.112",
+      "changes": [
+        "`ouro up` no longer prints the 'ouro updated to X (was Y)' message twice when the update flow re-execs from a newly installed version."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.111",
+      "changes": [
+        "The PATH installer now repairs a stale ~/.local/bin/ouro launcher in place instead of deleting it, so a shadowing old wrapper can no longer cause the wrong CLI version to load and produce backwards 'ouro updated to X (was Y)' messages."
+      ]
+    },
     {
       "version": "0.1.0-alpha.110",
       "changes": [

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

@@ -1484,9 +1484,9 @@ async function performSystemSetup(deps) {
     if (deps.installOuroCommand) {
         try {
             const installResult = deps.installOuroCommand();
-            /* v8 ignore next -- migration hint: only fires once during old→new layout migration @preserve */
-            if (installResult.migratedFromOldPath) {
-                deps.writeStdout("migrated ouro to ~/.ouro-cli/ — open a new terminal or run: source ~/.zshrc");
+            /* v8 ignore next -- old-launcher repair hint: fires when stale ~/.local/bin/ouro is fixed @preserve */
+            if (installResult.repairedOldLauncher) {
+                deps.writeStdout("repaired stale ouro launcher at ~/.local/bin/ouro");
             }
         }
         catch (error) {
@@ -1884,9 +1884,12 @@ async function runOuroCli(args, deps = createDefaultOuroCliDeps()) {
         // hooks overwrite it. This detects when npx downloaded a newer CLI.
         const previousCliVersion = readFirstBundleMetaVersion(bundlesRoot);
         const updateSummary = await (0, update_hooks_1.applyPendingUpdates)(bundlesRoot, currentVersion);
-        // Notify about CLI binary update (npx downloaded a new version)
+        // Notify about CLI binary update (npx downloaded a new version).
+        // Skip when the symlink already points to the running version — that
+        // means path 1 (checkForCliUpdate + reExecFromNewVersion) already
+        // printed the update message before re-exec.
         /* v8 ignore start -- CLI update detection: tested via daemon-cli-version-detect.test.ts @preserve */
-        if (previousCliVersion && previousCliVersion !== currentVersion) {
+        if (previousCliVersion && previousCliVersion !== currentVersion && linkedVersionBeforeUp !== currentVersion) {
             deps.writeStdout(`ouro updated to ${currentVersion} (was ${previousCliVersion})`);
             const changelogCommand = (0, ouro_version_manager_1.buildChangelogCommand)(previousCliVersion, currentVersion);
             /* v8 ignore next -- buildChangelogCommand is non-null when previous/current runtime versions differ @preserve */

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

@@ -71,29 +71,15 @@ function buildPathExportLine(binDir, shell) {
     }
     return `\n# Added by ouro\nexport PATH="${binDir}:$PATH"\n`;
 }
-/**
- * Remove lines matching the old ouro PATH block from shell profile content.
- * Returns the cleaned content.
- */
-function removeOldPathBlock(content, oldBinDir) {
-    const lines = content.split("\n");
-    const result = [];
-    let i = 0;
-    while (i < lines.length) {
-        // Detect "# Added by ouro" followed by a PATH export containing the old binDir
-        if (lines[i].trim() === "# Added by ouro" && i + 1 < lines.length && lines[i + 1].includes(oldBinDir)) {
-            // Skip both lines (comment + export)
-            i += 2;
-            // Also skip trailing blank line if present
-            /* v8 ignore next -- edge: trailing blank line presence varies @preserve */
-            if (i < lines.length && lines[i].trim() === "")
-                i++;
-            continue;
-        }
-        result.push(lines[i]);
-        i++;
+function isWrapperCurrent(scriptPath, existsSync, readFileSync) {
+    if (!existsSync(scriptPath))
+        return false;
+    try {
+        return readFileSync(scriptPath, "utf-8") === WRAPPER_SCRIPT;
+    }
+    catch {
+        return false;
     }
-    return result.join("\n");
 }
 function installOuroCommand(deps = {}) {
     /* v8 ignore start -- dep defaults: only used in real runtime, tests always inject @preserve */
@@ -105,9 +91,6 @@ 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 unlinkSync = deps.unlinkSync ?? fs.unlinkSync;
-    const rmdirSync = deps.rmdirSync ?? fs.rmdirSync;
-    const readdirSync = deps.readdirSync ?? ((p) => fs.readdirSync(p).map(String));
     const envPath = deps.envPath ?? process.env.PATH ?? "";
     const shell = deps.shell ?? process.env.SHELL;
     /* v8 ignore stop */
@@ -118,7 +101,7 @@ function installOuroCommand(deps = {}) {
             message: "skipped ouro PATH install on Windows",
             meta: { platform },
         });
-        return { installed: false, scriptPath: null, pathReady: false, shellProfileUpdated: null, skippedReason: "windows", migratedFromOldPath: false };
+        return { installed: false, scriptPath: null, pathReady: false, shellProfileUpdated: null, skippedReason: "windows", repairedOldLauncher: false };
     }
     // Ensure ~/.ouro-cli/ directory layout exists
     if (deps.ensureCliLayout) {
@@ -126,85 +109,47 @@ function installOuroCommand(deps = {}) {
     }
     const binDir = path.join(homeDir, ".ouro-cli", "bin");
     const scriptPath = path.join(binDir, "ouro");
-    // ── Migration from old ~/.local/bin/ouro ──
-    const oldBinDir = path.join(homeDir, ".local", "bin");
-    const oldScriptPath = path.join(oldBinDir, "ouro");
-    let migratedFromOldPath = false;
-    if (existsSync(oldScriptPath)) {
+    const oldScriptPath = path.join(homeDir, ".local", "bin", "ouro");
+    const modernCurrent = isWrapperCurrent(scriptPath, existsSync, readFileSync);
+    const oldExists = existsSync(oldScriptPath);
+    const oldCurrent = oldExists && isWrapperCurrent(oldScriptPath, existsSync, readFileSync);
+    // ── Repair old ~/.local/bin/ouro launcher ──
+    // If the old launcher exists with stale content it can shadow the modern
+    // path and cause the wrong CLI version to run.  Overwrite it with the
+    // current wrapper so both paths resolve to ~/.ouro-cli/CurrentVersion.
+    let repairedOldLauncher = false;
+    if (oldExists && !oldCurrent) {
         (0, runtime_1.emitNervesEvent)({
             component: "daemon",
-            event: "daemon.ouro_path_migrate_start",
-            message: "migrating ouro from old PATH location",
+            event: "daemon.ouro_path_repair_old",
+            message: "repairing stale old launcher at ~/.local/bin/ouro",
             meta: { oldScriptPath },
         });
         try {
-            unlinkSync(oldScriptPath);
-            migratedFromOldPath = true;
-            // Remove empty ~/.local/bin/ directory
-            if (existsSync(oldBinDir)) {
-                try {
-                    const remaining = readdirSync(oldBinDir);
-                    if (remaining.length === 0) {
-                        rmdirSync(oldBinDir);
-                    }
-                }
-                catch {
-                    // Best effort cleanup
-                }
-            }
+            writeFileSync(oldScriptPath, WRAPPER_SCRIPT, { mode: 0o755 });
+            chmodSync(oldScriptPath, 0o755);
+            repairedOldLauncher = true;
         }
         catch {
-            // Best effort migration — continue with new install
+            // Best effort — old launcher repair failure must not block modern install
         }
-        // Remove old PATH entry from shell profile
-        const profilePath = detectShellProfile(homeDir, shell);
-        /* v8 ignore start -- profile cleanup: only fires during migration from old layout @preserve */
-        if (profilePath) {
-            try {
-                const profileContent = readFileSync(profilePath, "utf-8");
-                if (profileContent.includes(oldBinDir)) {
-                    const cleaned = removeOldPathBlock(profileContent, oldBinDir);
-                    writeFileSync(profilePath, cleaned);
-                }
-            }
-            catch {
-                // Best effort profile cleanup
-            }
-        }
-        /* v8 ignore stop */
     }
-    (0, runtime_1.emitNervesEvent)({
-        component: "daemon",
-        event: "daemon.ouro_path_install_start",
-        message: "installing ouro command to PATH",
-        meta: { scriptPath, binDir },
-    });
-    // If ouro already exists, check content and repair if stale
-    if (existsSync(scriptPath)) {
-        let existingContent = "";
-        try {
-            existingContent = readFileSync(scriptPath, "utf-8");
-        }
-        catch {
-            // Can't read — treat as stale, will overwrite below
-        }
-        if (existingContent === WRAPPER_SCRIPT) {
-            (0, runtime_1.emitNervesEvent)({
-                component: "daemon",
-                event: "daemon.ouro_path_install_skip",
-                message: "ouro command already installed",
-                meta: { scriptPath },
-            });
-            return { installed: false, scriptPath, pathReady: isBinDirInPath(binDir, envPath), shellProfileUpdated: null, skippedReason: "already-installed", migratedFromOldPath };
-        }
-        // Content is stale — repair by overwriting
+    // ── Fast-path: modern wrapper already current ──
+    if (modernCurrent) {
         (0, runtime_1.emitNervesEvent)({
             component: "daemon",
-            event: "daemon.ouro_path_install_repair",
-            message: "repairing stale ouro wrapper script",
+            event: "daemon.ouro_path_install_skip",
+            message: "ouro command already installed",
             meta: { scriptPath },
         });
+        return { installed: false, scriptPath, pathReady: isBinDirInPath(binDir, envPath), shellProfileUpdated: null, skippedReason: "already-installed", repairedOldLauncher };
     }
+    (0, runtime_1.emitNervesEvent)({
+        component: "daemon",
+        event: "daemon.ouro_path_install_start",
+        message: existsSync(scriptPath) ? "repairing stale ouro wrapper script" : "installing ouro command to PATH",
+        meta: { scriptPath, binDir },
+    });
     try {
         mkdirSync(binDir, { recursive: true });
         writeFileSync(scriptPath, WRAPPER_SCRIPT, { mode: 0o755 });
@@ -218,7 +163,7 @@ function installOuroCommand(deps = {}) {
             message: "failed to install ouro command",
             meta: { error: error instanceof Error ? error.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(error) },
         });
-        return { installed: false, scriptPath: null, pathReady: false, shellProfileUpdated: null, skippedReason: error instanceof Error ? error.message : /* v8 ignore next -- defensive @preserve */ String(error), migratedFromOldPath };
+        return { installed: false, scriptPath: null, pathReady: false, shellProfileUpdated: null, skippedReason: error instanceof Error ? error.message : /* v8 ignore next -- defensive @preserve */ String(error), repairedOldLauncher };
     }
     // Check if ~/.ouro-cli/bin is already in PATH
     let shellProfileUpdated = null;
@@ -256,5 +201,5 @@ function installOuroCommand(deps = {}) {
         message: "ouro command installed",
         meta: { scriptPath, pathReady, shellProfileUpdated },
     });
-    return { installed: true, scriptPath, pathReady, shellProfileUpdated, migratedFromOldPath };
+    return { installed: true, scriptPath, pathReady, shellProfileUpdated, repairedOldLauncher };
 }

package/package.json

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