@ouro.bot/cli 0.1.0-alpha.5 → 0.1.0-alpha.500

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

@@ -0,0 +1,425 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.diagnoseOuroPath = diagnoseOuroPath;
+exports.installOuroCommand = installOuroCommand;
+const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
+const path = __importStar(require("path"));
+const runtime_1 = require("../../nerves/runtime");
+const WRAPPER_SCRIPT = `#!/bin/sh
+# Check for dev mode — if dev-config.json exists, dispatch to the dev repo
+# Skip dev dispatch for "up" command (explicitly returns to production)
+DEV_CONFIG="$HOME/.ouro-cli/dev-config.json"
+if [ -f "$DEV_CONFIG" ] && [ "$1" != "up" ]; then
+  DEV_REPO=$(node -e "try{console.log(JSON.parse(require('fs').readFileSync('$DEV_CONFIG','utf-8')).repoPath)}catch{}" 2>/dev/null)
+  DEV_ENTRY="$DEV_REPO/dist/heart/daemon/ouro-entry.js"
+  if [ -n "$DEV_REPO" ] && [ -e "$DEV_ENTRY" ]; then
+    exec node "$DEV_ENTRY" "$@"
+  fi
+fi
+# Fall back to installed version
+ENTRY="$HOME/.ouro-cli/CurrentVersion/node_modules/@ouro.bot/cli/dist/heart/daemon/ouro-entry.js"
+if [ ! -e "$ENTRY" ]; then
+  echo "ouro not installed. Run: npx ouro.bot@latest" >&2
+  exit 1
+fi
+exec node "$ENTRY" "$@"
+`;
+function writeWrapperScript(scriptPath, mkdirSync, writeFileSync, chmodSync) {
+    mkdirSync(path.dirname(scriptPath), { recursive: true });
+    writeFileSync(scriptPath, WRAPPER_SCRIPT, { mode: 0o755 });
+    chmodSync(scriptPath, 0o755);
+}
+function detectShellProfile(homeDir, shell, platform) {
+    if (!shell)
+        return null;
+    const base = path.basename(shell);
+    if (base === "zsh")
+        return path.join(homeDir, ".zshrc");
+    if (base === "bash") {
+        // macOS uses .bash_profile; Linux/WSL uses .bashrc (the default
+        // interactive shell config on Debian/Ubuntu). Writing to .bash_profile
+        // on Linux often has no effect because non-login shells skip it.
+        /* v8 ignore next -- ?? fallback: callers always pass platform from deps @preserve */
+        const effectivePlatform = platform ?? process.platform;
+        return effectivePlatform === "darwin"
+            ? path.join(homeDir, ".bash_profile")
+            : path.join(homeDir, ".bashrc");
+    }
+    if (base === "fish")
+        return path.join(homeDir, ".config", "fish", "config.fish");
+    return null;
+}
+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") {
+        return `\n# Added by ouro\nset -gx PATH ${binDir} $PATH\n`;
+    }
+    return `\n# Added by ouro\nexport PATH="${binDir}:$PATH"\n`;
+}
+function isWrapperCurrent(scriptPath, existsSync, readFileSync) {
+    if (!existsSync(scriptPath))
+        return false;
+    try {
+        return readFileSync(scriptPath, "utf-8") === WRAPPER_SCRIPT;
+    }
+    catch {
+        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)
+            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;
+    const homeDir = deps.homeDir ?? os.homedir();
+    const existsSync = deps.existsSync ?? fs.existsSync;
+    const mkdirSync = deps.mkdirSync ?? fs.mkdirSync;
+    const writeFileSync = deps.writeFileSync ?? fs.writeFileSync;
+    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 */
+    if (platform === "win32") {
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.ouro_path_install_skip",
+            message: "skipped ouro PATH install on Windows",
+            meta: { platform },
+        });
+        return { installed: false, scriptPath: null, pathReady: false, shellProfileUpdated: null, skippedReason: "windows", repairedOldLauncher: false };
+    }
+    // Ensure ~/.ouro-cli/ directory layout exists
+    if (deps.ensureCliLayout) {
+        deps.ensureCliLayout();
+    }
+    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);
+    // ── 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_repair_old",
+            message: "repairing stale old launcher at ~/.local/bin/ouro",
+            meta: { oldScriptPath },
+        });
+        try {
+            writeFileSync(oldScriptPath, WRAPPER_SCRIPT, { mode: 0o755 });
+            chmodSync(oldScriptPath, 0o755);
+            repairedOldLauncher = true;
+        }
+        catch {
+            // Best effort — old launcher repair failure must not block modern install
+        }
+    }
+    // ── Fast-path: modern wrapper already current ──
+    if (modernCurrent) {
+        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",
+                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, pathStatus: pathResolution.status, resolvedPath: pathResolution.resolvedPath },
+        });
+        return {
+            installed: false,
+            scriptPath,
+            pathReady: isBinDirInPath(binDir, envPath),
+            shellProfileUpdated: null,
+            skippedReason: "already-installed",
+            repairedOldLauncher,
+            repairedShadowedLauncherPath,
+            pathResolution,
+        };
+    }
+    (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 {
+        if (!modernCurrent) {
+            writeWrapperScript(scriptPath, mkdirSync, writeFileSync, chmodSync);
+        }
+    }
+    catch (error) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "daemon",
+            event: "daemon.ouro_path_install_error",
+            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), repairedOldLauncher };
+    }
+    // Check if ~/.ouro-cli/bin is already in PATH
+    const pathReady = isBinDirInPath(binDir, envPath);
+    let shellProfileUpdated = null;
+    if (!pathReady) {
+        const profilePath = detectShellProfile(homeDir, shell, platform);
+        if (profilePath) {
+            try {
+                let existing = "";
+                try {
+                    existing = readFileSync(profilePath, "utf-8");
+                }
+                catch {
+                    // Profile doesn't exist yet — that's fine, we'll create it
+                }
+                if (!existing.includes(binDir)) {
+                    appendFileSync(profilePath, buildPathExportLine(binDir, shell));
+                    shellProfileUpdated = profilePath;
+                }
+            }
+            catch (error) {
+                (0, runtime_1.emitNervesEvent)({
+                    level: "warn",
+                    component: "daemon",
+                    event: "daemon.ouro_path_profile_error",
+                    message: "failed to update shell profile for PATH",
+                    meta: { profilePath, error: error instanceof Error ? error.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(error) },
+                });
+            }
+        }
+    }
+    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",
+            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,
+            repairedShadowedLauncherPath,
+            pathStatus: pathResolution.status,
+            resolvedPath: pathResolution.resolvedPath,
+        },
+    });
+    return {
+        installed: true,
+        scriptPath,
+        pathReady,
+        shellProfileUpdated,
+        repairedOldLauncher,
+        repairedShadowedLauncherPath,
+        pathResolution,
+    };
+}

package/dist/heart/{daemon → versioning}/ouro-uti.js

@@ -42,7 +42,13 @@ const identity_1 = require("../identity");
 const runtime_1 = require("../../nerves/runtime");
 const LSREGISTER_PATH = "/System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister";
 const ICON_SIZES = [16, 32, 128, 256, 512];
-function resolveIconSourcePath(repoRoot) {
+function resolveIconSourcePath(repoRoot, existsSync) {
+    // Prefer bundled asset (shipped with npm package)
+    const bundledPath = path.resolve(repoRoot, "assets", "ouroboros.png");
+    if (existsSync(bundledPath)) {
+        return bundledPath;
+    }
+    // Fall back to adjacent repo path (dev environment)
     return path.resolve(repoRoot, "..", "ouroboros-website", "public", "images", "ouroboros.png");
 }
 function buildIconAsset(iconSourcePath, icnsPath, iconsetDir, deps) {
@@ -91,6 +97,7 @@ function buildInfoPlist(iconInstalled) {
         "      <key>UTTypeConformsTo</key>",
         "      <array>",
         "        <string>public.folder</string>",
+        "        <string>com.apple.package</string>",
         "      </array>",
         "      <key>UTTypeTagSpecification</key>",
         "      <dict>",
@@ -112,6 +119,8 @@ function buildInfoPlist(iconInstalled) {
         "      </array>",
         "      <key>CFBundleTypeRole</key>",
         "      <string>Editor</string>",
+        "      <key>LSTypeIsPackage</key>",
+        "      <true/>",
         `      ${iconTag.trim()}`,
         "    </dict>",
         "  </array>",
@@ -152,7 +161,7 @@ function registerOuroBundleUti(deps = {}) {
     const plistPath = path.join(contentsDir, "Info.plist");
     const icnsPath = path.join(resourcesDir, "ouro.icns");
     const iconsetDir = path.join(supportRoot, "ouro.iconset");
-    const iconSourcePath = resolveIconSourcePath(repoRoot);
+    const iconSourcePath = resolveIconSourcePath(repoRoot, existsSync);
     (0, runtime_1.emitNervesEvent)({
         component: "daemon",
         event: "daemon.ouro_uti_register_start",