@ouro.bot/cli 0.1.0-alpha.72 → 0.1.0-alpha.721

package/dist/heart/daemon/logs-prune.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pruneDaemonLogs = pruneDaemonLogs;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const crypto_1 = require("crypto");
+const nerves_1 = require("../../nerves");
+const runtime_1 = require("../../nerves/runtime");
+const identity_1 = require("../identity");
+function isActiveLogStream(name) {
+    if (name.endsWith(".ndjson")) {
+        return !/\.\d+\.ndjson$/.test(name);
+    }
+    if (name.endsWith(".log")) {
+        return !/\.\d+\.log$/.test(name);
+    }
+    return false;
+}
+function pruneDaemonLogs(options = {}) {
+    /* v8 ignore next -- defensive: tests always pass logsDir to avoid prod paths @preserve */
+    const logsDir = options.logsDir ?? (0, identity_1.getAgentDaemonLogsDir)(options.agentName);
+    const maxSizeBytes = options.maxSizeBytes ?? nerves_1.DEFAULT_MAX_LOG_SIZE_BYTES;
+    const maxGenerations = options.maxGenerations ?? nerves_1.DEFAULT_MAX_GENERATIONS;
+    const traceId = (0, crypto_1.randomUUID)();
+    (0, runtime_1.emitNervesEvent)({
+        component: "nerves",
+        event: "nerves.logs_prune_start",
+        trace_id: traceId,
+        message: "pruning daemon logs",
+        meta: { logsDir, maxSizeBytes, maxGenerations },
+    });
+    let completed = false;
+    try {
+        if (!(0, fs_1.existsSync)(logsDir)) {
+            completed = true;
+            (0, runtime_1.emitNervesEvent)({
+                component: "nerves",
+                event: "nerves.logs_prune_end",
+                trace_id: traceId,
+                message: "daemon logs dir does not exist",
+                meta: { logsDir, filesCompacted: 0, bytesFreed: 0 },
+            });
+            return { filesCompacted: 0, bytesFreed: 0 };
+        }
+        let filesCompacted = 0;
+        let bytesFreed = 0;
+        // Enumerate and rotate each active structured stream plus legacy launchd
+        // .log streams. We explicitly skip .gz and other files — only the active
+        // stream can be a rotation candidate. Legacy generation files are handled
+        // inside rotateIfNeeded's generation-shift step, so we skip them here to
+        // avoid double-rotating.
+        for (const name of (0, fs_1.readdirSync)(logsDir)) {
+            if (!isActiveLogStream(name))
+                continue;
+            const filePath = (0, path_1.join)(logsDir, name);
+            let sizeBefore;
+            try {
+                sizeBefore = (0, fs_1.statSync)(filePath).size;
+                /* v8 ignore start -- defensive: file disappears between readdir and stat @preserve */
+            }
+            catch {
+                continue;
+            }
+            /* v8 ignore stop */
+            if (sizeBefore < maxSizeBytes)
+                continue;
+            // rotateIfNeeded returns true because we pre-checked sizeBefore >=
+            // maxSizeBytes above. The false branch of `if (rotated)` is defensive
+            // and unreachable under normal flow; we skip it from coverage so a
+            // future refactor that weakens the pre-check still reports correct
+            // counts without needing a contrived test.
+            const rotated = (0, nerves_1.rotateIfNeeded)(filePath, {
+                maxSizeBytes,
+                maxGenerations,
+                compress: true,
+            });
+            /* v8 ignore next 3 -- defensive: pre-check guarantees rotated=true @preserve */
+            if (!rotated) {
+                continue;
+            }
+            filesCompacted += 1;
+            bytesFreed += sizeBefore;
+        }
+        completed = true;
+        (0, runtime_1.emitNervesEvent)({
+            component: "nerves",
+            event: "nerves.logs_prune_end",
+            trace_id: traceId,
+            message: "daemon logs pruned",
+            meta: { logsDir, filesCompacted, bytesFreed },
+        });
+        return { filesCompacted, bytesFreed };
+    }
+    catch (err) {
+        /* v8 ignore next -- defensive: completed=true only reached after try returns @preserve */
+        if (!completed) {
+            /* v8 ignore next -- defensive: rotation always throws real Errors @preserve */
+            const reason = err instanceof Error ? err.message : String(err);
+            (0, runtime_1.emitNervesEvent)({
+                component: "nerves",
+                event: "nerves.logs_prune_error",
+                trace_id: traceId,
+                level: "error",
+                message: "daemon logs prune failed",
+                meta: { logsDir, error: reason },
+            });
+        }
+        throw err;
+    }
+}

package/dist/heart/daemon/mcp-canary.js

@@ -0,0 +1,393 @@
+"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.DEFAULT_CANARY_TIMEOUT_MS = void 0;
+exports.buildMcpBridgeRepairGuidance = buildMcpBridgeRepairGuidance;
+exports.formatMcpBridgeRepairDetails = formatMcpBridgeRepairDetails;
+exports.buildMcpDoctorNextSteps = buildMcpDoctorNextSteps;
+exports.formatMcpDoctorNextStepDetails = formatMcpDoctorNextStepDetails;
+exports.parseMcpStatusText = parseMcpStatusText;
+exports.runMcpStatusCanary = runMcpStatusCanary;
+exports.formatMcpStatusCanaryResult = formatMcpStatusCanaryResult;
+exports.formatMcpStatusDoctorResult = formatMcpStatusDoctorResult;
+exports.createMcpStatusCanaryProbe = createMcpStatusCanaryProbe;
+const child_process_1 = require("child_process");
+const path = __importStar(require("path"));
+const runtime_1 = require("../../nerves/runtime");
+exports.DEFAULT_CANARY_TIMEOUT_MS = 60_000;
+const MCP_PROTOCOL_VERSION = "2024-11-05";
+function defaultCommandArgs(agent, socketPath) {
+    const entryPath = path.join(__dirname, "ouro-bot-entry.js");
+    return [
+        entryPath,
+        "mcp-serve",
+        "--agent",
+        agent,
+        ...(socketPath ? ["--socket", socketPath] : []),
+    ];
+}
+function responseText(response) {
+    const result = response.result;
+    if (!result || typeof result !== "object" || Array.isArray(result))
+        return JSON.stringify(response);
+    const content = result.content;
+    if (!Array.isArray(content))
+        return JSON.stringify(response);
+    const first = content[0];
+    if (!first || typeof first !== "object" || Array.isArray(first))
+        return JSON.stringify(response);
+    const text = first.text;
+    return typeof text === "string" ? text : JSON.stringify(response);
+}
+function parseFields(line) {
+    const parsed = {};
+    for (const segment of line.split("\t")) {
+        const idx = segment.indexOf("=");
+        if (idx <= 0)
+            continue;
+        parsed[segment.slice(0, idx)] = segment.slice(idx + 1);
+    }
+    return parsed;
+}
+function shellArg(value) {
+    return /^[A-Za-z0-9._/-]+$/.test(value)
+        ? value
+        : `'${value.replace(/'/g, "'\\''")}'`;
+}
+function buildMcpBridgeRepairGuidance(agent) {
+    const agentArg = shellArg(agent);
+    return {
+        actor: "agent-runnable",
+        commands: [
+            `ouro setup --tool codex --agent ${agentArg}`,
+            `ouro setup --tool claude-code --agent ${agentArg}`,
+        ],
+        reload: "open a fresh dev-tool session after setup; existing MCP processes keep their old runtime",
+        verify: `ouro mcp doctor --agent ${agentArg}`,
+    };
+}
+function formatMcpBridgeRepairDetails(repair) {
+    return [
+        `repair actor=${repair.actor}`,
+        ...repair.commands.map((command) => `repair command=${command}`),
+        `reload required: ${repair.reload}`,
+        `verify command=${repair.verify}`,
+    ];
+}
+function buildMcpDoctorNextSteps(result, agent) {
+    const agentArg = shellArg(agent);
+    const text = [result.summary, ...result.details].join("\n");
+    const daemonUnreachable = text.includes("daemon=unreachable")
+        || text.includes("ECONNREFUSED")
+        || text.includes("ENOENT");
+    if (daemonUnreachable) {
+        return {
+            actor: "agent-runnable",
+            commands: [
+                "ouro up",
+                `ouro mcp doctor --agent ${agentArg}`,
+            ],
+            note: "start or refresh the daemon before trusting bridge status",
+        };
+    }
+    return {
+        actor: "agent-runnable",
+        commands: [
+            "ouro doctor",
+            `ouro status --agent ${agentArg}`,
+            `ouro repair --agent ${agentArg}`,
+            `ouro mcp doctor --agent ${agentArg}`,
+        ],
+        note: "fix reported daemon or sense health before rerunning bridge registration repair",
+    };
+}
+function formatMcpDoctorNextStepDetails(nextSteps) {
+    return [
+        `next actor=${nextSteps.actor}`,
+        ...nextSteps.commands.map((command) => `next command=${command}`),
+        `next note=${nextSteps.note}`,
+    ];
+}
+function parseMcpStatusText(text) {
+    const daemon = {};
+    const senses = {};
+    for (const line of text.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        if (trimmed.startsWith("daemon=")) {
+            Object.assign(daemon, parseFields(trimmed));
+            continue;
+        }
+        if (!trimmed.startsWith("sense="))
+            continue;
+        const fields = parseFields(trimmed);
+        const sense = fields.sense;
+        if (!sense)
+            continue;
+        const [name, status = "unknown"] = sense.split(":");
+        senses[name] = { ...fields, name, status };
+    }
+    return { daemon, senses, raw: text };
+}
+function validateMcpStatus(parsed, requiredSenses, options = {}) {
+    const failures = [];
+    if (parsed.daemon.daemon !== "running") {
+        failures.push(`daemon=${parsed.daemon.daemon ?? "missing"}`);
+    }
+    if (!options.ignoreOverviewHealth && parsed.daemon.health !== "ok") {
+        failures.push(`health=${parsed.daemon.health ?? "missing"}`);
+    }
+    const hasVersionMismatch = !!(parsed.daemon.daemonVersion &&
+        parsed.daemon.mcpVersion &&
+        parsed.daemon.daemonVersion !== parsed.daemon.mcpVersion);
+    if (hasVersionMismatch) {
+        failures.push(`version mismatch daemon=${parsed.daemon.daemonVersion} mcp=${parsed.daemon.mcpVersion}`);
+    }
+    if (!options.ignoreSenseHealth) {
+        for (const [sense, row] of Object.entries(parsed.senses)) {
+            if (row.status === "disabled")
+                continue;
+            if (row.status === "running" || row.status === "interactive")
+                continue;
+            failures.push(`sense=${sense}:${row.status}`);
+        }
+    }
+    for (const sense of requiredSenses) {
+        const row = parsed.senses[sense];
+        if (!row) {
+            failures.push(`required sense missing: ${sense}`);
+            continue;
+        }
+        if (row.status !== "running" && row.status !== "interactive") {
+            failures.push(`required sense unhealthy: ${sense}:${row.status}`);
+        }
+    }
+    const senseSummary = Object.values(parsed.senses)
+        .map((row) => `${row.name}:${row.status}`)
+        .join(",");
+    const summary = failures.length === 0
+        ? `mcp canary ok: daemon=${parsed.daemon.daemon} health=${parsed.daemon.health}${options.ignoreOverviewHealth ? " (overview ignored)" : ""} senses=${senseSummary}${options.ignoreSenseHealth ? " (sense health reported, not gated)" : ""}`
+        : `mcp canary failed: ${failures.join("; ")}`;
+    const repair = hasVersionMismatch && options.agent
+        ? buildMcpBridgeRepairGuidance(options.agent)
+        : undefined;
+    const repairDetails = repair ? formatMcpBridgeRepairDetails(repair) : [];
+    return {
+        ok: failures.length === 0,
+        summary,
+        details: failures.length === 0 ? [parsed.raw] : [...failures, ...repairDetails, parsed.raw],
+        parsed,
+        ...(repair ? { repair } : {}),
+    };
+}
+async function runMcpStatusCanary(options) {
+    const timeoutMs = options.timeoutMs ?? exports.DEFAULT_CANARY_TIMEOUT_MS;
+    /* v8 ignore next -- default spawn is exercised by live canaries, while unit tests inject a fake child @preserve */
+    const spawnImpl = options.spawnImpl ?? child_process_1.spawn;
+    const command = options.command ?? process.execPath;
+    const commandArgs = options.commandArgs ?? defaultCommandArgs(options.agent, options.socketPath);
+    const requiredSenses = options.requiredSenses ?? [];
+    (0, runtime_1.emitNervesEvent)({
+        component: "daemon",
+        event: "daemon.mcp_canary_start",
+        message: "starting MCP status canary",
+        meta: {
+            agent: options.agent,
+            command,
+            commandArgs,
+            timeoutMs,
+            requiredSenses,
+            ignoreOverviewHealth: options.ignoreOverviewHealth === true,
+            ignoreSenseHealth: options.ignoreSenseHealth === true,
+        },
+    });
+    const child = spawnImpl(command, commandArgs, { stdio: ["pipe", "pipe", "pipe"] });
+    let buffer = "";
+    let stderr = "";
+    const pending = new Map();
+    function cleanup() {
+        for (const [, request] of pending) {
+            clearTimeout(request.timer);
+        }
+        pending.clear();
+        if (!child.killed)
+            child.kill();
+    }
+    function failAll(error) {
+        for (const [, request] of pending) {
+            clearTimeout(request.timer);
+            request.reject(error);
+        }
+        pending.clear();
+    }
+    child.stderr?.setEncoding("utf8");
+    child.stderr?.on("data", (chunk) => {
+        stderr += chunk.toString();
+    });
+    child.stdout?.setEncoding("utf8");
+    child.stdout?.on("data", (chunk) => {
+        buffer += chunk.toString();
+        for (;;) {
+            const idx = buffer.indexOf("\n");
+            if (idx === -1)
+                break;
+            const line = buffer.slice(0, idx).trim();
+            buffer = buffer.slice(idx + 1);
+            if (!line)
+                continue;
+            let response;
+            try {
+                response = JSON.parse(line);
+            }
+            catch {
+                failAll(new Error(`MCP canary received malformed JSON: ${line}`));
+                return;
+            }
+            const id = typeof response.id === "number" ? response.id : null;
+            if (id === null)
+                continue;
+            const request = pending.get(id);
+            if (!request)
+                continue;
+            pending.delete(id);
+            clearTimeout(request.timer);
+            request.resolve(response);
+        }
+    });
+    child.on("error", (error) => failAll(error));
+    child.on("close", (code, signal) => {
+        if (pending.size === 0)
+            return;
+        failAll(new Error(`MCP canary process closed before response code=${code} signal=${signal ?? "none"} stderr=${stderr.trim()}`));
+    });
+    let nextId = 1;
+    function request(method, params) {
+        return new Promise((resolve, reject) => {
+            if (!child.stdin?.writable) {
+                reject(new Error("MCP canary stdin is not writable"));
+                return;
+            }
+            const id = nextId++;
+            const timer = setTimeout(() => {
+                pending.delete(id);
+                reject(new Error(`MCP canary timed out waiting for ${method}; stderr=${stderr.trim()}`));
+            }, timeoutMs);
+            pending.set(id, { resolve, reject, timer });
+            child.stdin.write(JSON.stringify({ jsonrpc: "2.0", id, method, params }) + "\n");
+        });
+    }
+    try {
+        await request("initialize", {
+            protocolVersion: MCP_PROTOCOL_VERSION,
+            capabilities: {},
+            clientInfo: { name: "ouro-mcp-canary", version: "1.0" },
+        });
+        child.stdin?.write(JSON.stringify({ jsonrpc: "2.0", method: "initialized" }) + "\n");
+        const statusResponse = await request("tools/call", {
+            name: "status",
+            arguments: {},
+        });
+        const result = statusResponse.result;
+        if (result && typeof result === "object" && !Array.isArray(result) && result.isError === true) {
+            throw new Error(responseText(statusResponse));
+        }
+        const parsed = parseMcpStatusText(responseText(statusResponse));
+        const canary = validateMcpStatus(parsed, requiredSenses, {
+            agent: options.agent,
+            ignoreOverviewHealth: options.ignoreOverviewHealth,
+            ignoreSenseHealth: options.ignoreSenseHealth,
+        });
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: canary.ok ? "daemon.mcp_canary_end" : "daemon.mcp_canary_error",
+            level: canary.ok ? "info" : "error",
+            message: canary.summary,
+            meta: { agent: options.agent, ok: canary.ok },
+        });
+        return canary;
+    }
+    catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.mcp_canary_error",
+            level: "error",
+            message: "MCP status canary failed",
+            meta: { agent: options.agent, reason },
+        });
+        return { ok: false, summary: `mcp canary failed: ${reason}`, details: [reason] };
+    }
+    finally {
+        child.stdin?.end();
+        cleanup();
+    }
+}
+function formatMcpStatusCanaryResult(result) {
+    return [
+        result.ok ? "mcp canary: ok" : "mcp canary: failed",
+        result.summary,
+        ...result.details.map((line) => `  ${line}`),
+    ].join("\n");
+}
+function formatMcpStatusDoctorResult(result, agent) {
+    const rawDetails = result.details.filter((line) => !line.startsWith("repair ")
+        && !line.startsWith("reload required:")
+        && !line.startsWith("verify command="));
+    const lines = [
+        result.ok ? "mcp doctor: ok" : "mcp doctor: failed",
+        result.summary,
+        ...rawDetails.map((line) => `  ${line}`),
+    ];
+    if (result.ok || result.repair) {
+        const repair = result.repair ?? buildMcpBridgeRepairGuidance(agent);
+        lines.push("bridge registration path:");
+        lines.push(...formatMcpBridgeRepairDetails(repair).map((line) => `  ${line}`));
+    }
+    else {
+        lines.push("next checks:");
+        lines.push(...formatMcpDoctorNextStepDetails(buildMcpDoctorNextSteps(result, agent)).map((line) => `  ${line}`));
+    }
+    return lines.join("\n");
+}
+function createMcpStatusCanaryProbe(options) {
+    return {
+        name: `mcp-canary:${options.agent}`,
+        check: async () => {
+            const result = await runMcpStatusCanary(options);
+            return { ok: result.ok, detail: result.summary };
+        },
+    };
+}

package/dist/heart/daemon/message-router.js

@@ -34,24 +34,34 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileMessageRouter = void 0;
+exports.getDaemonMessageRouterDir = getDaemonMessageRouterDir;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const runtime_1 = require("../../nerves/runtime");
-const identity_1 = require("../identity");
-function messageId(nowIso) {
-    return `msg-${nowIso.replace(/[^0-9]/g, "")}`;
+const ouro_version_manager_1 = require("../versioning/ouro-version-manager");
+function getDaemonMessageRouterDir(homeDir) {
+    return path.join((0, ouro_version_manager_1.getOuroCliHome)(homeDir), "daemon", "messages");
+}
+function messageId(nowIso, sequence) {
+    const base = `msg-${nowIso.replace(/[^0-9]/g, "")}`;
+    return sequence === 1 ? base : `${base}-${sequence}`;
 }
 class FileMessageRouter {
     baseDir;
     now;
+    maxMessagesPerInbox;
+    messageIdSequences = new Map();
     constructor(options = {}) {
-        this.baseDir = options.baseDir ?? (0, identity_1.getAgentMessagesRoot)();
+        this.baseDir = options.baseDir ?? getDaemonMessageRouterDir(options.homeDir);
         this.now = options.now ?? (() => new Date().toISOString());
+        this.maxMessagesPerInbox = Math.max(1, Math.floor(options.maxMessagesPerInbox ?? 1000));
         fs.mkdirSync(this.baseDir, { recursive: true });
     }
     async send(input) {
         const queuedAt = this.now();
-        const id = messageId(queuedAt);
+        const sequence = (this.messageIdSequences.get(queuedAt) ?? 0) + 1;
+        this.messageIdSequences.set(queuedAt, sequence);
+        const id = messageId(queuedAt, sequence);
         const message = {
             id,
             from: input.from,
@@ -64,6 +74,7 @@ class FileMessageRouter {
         };
         const inboxPath = this.inboxPath(input.to);
         fs.appendFileSync(inboxPath, `${JSON.stringify(message)}\n`, "utf-8");
+        this.trimInbox(inboxPath);
         (0, runtime_1.emitNervesEvent)({
             component: "daemon",
             event: "daemon.message_queued",
@@ -103,5 +114,34 @@ class FileMessageRouter {
     inboxPath(agent) {
         return path.join(this.baseDir, `${agent}-inbox.jsonl`);
     }
+    trimInbox(inboxPath) {
+        const raw = fs.readFileSync(inboxPath, "utf-8");
+        const entries = raw
+            .split("\n")
+            .filter((line) => line.trim().length > 0)
+            .map((line) => {
+            try {
+                JSON.parse(line);
+                return { line, valid: true };
+            }
+            catch {
+                return { line, valid: false };
+            }
+        });
+        const validCount = entries.filter((entry) => entry.valid).length;
+        if (validCount <= this.maxMessagesPerInbox)
+            return;
+        let validSeen = 0;
+        const keepAfterValidIndex = validCount - this.maxMessagesPerInbox;
+        const kept = entries
+            .filter((entry) => {
+            if (!entry.valid)
+                return true;
+            validSeen += 1;
+            return validSeen > keepAfterValidIndex;
+        })
+            .map((entry) => entry.line);
+        fs.writeFileSync(inboxPath, `${kept.join("\n")}\n`, "utf-8");
+    }
 }
 exports.FileMessageRouter = FileMessageRouter;