agent-bober 0.12.0 → 0.15.0

package/dist/mcp/event-stream.js

@@ -0,0 +1,421 @@
+// ── EventStreamManager ──────────────────────────────────────────────
+//
+// Tails .bober/history.jsonl + .bober/telemetry/<date>.jsonl for matching
+// runIds and forwards events as server-initiated MCP notifications.
+//
+// stdout-safety: all diagnostic output MUST go to process.stderr.
+// The MCP stdio transport owns stdout; writing to stdout here would
+// corrupt the JSON-RPC stream.
+import { open as fsOpen, read as fsRead, close as fsClose, watch } from "node:fs";
+import { readFile, stat, mkdir } from "node:fs/promises";
+import { randomUUID } from "node:crypto";
+import { join, dirname } from "node:path";
+import { Buffer } from "node:buffer";
+// ── Constants ────────────────────────────────────────────────────────
+const NOTIF_EVENT = "bober/events";
+const NOTIF_DROPPED = "bober/events.dropped";
+// ── Helper: extract runId from a parsed JSONL record ────────────────
+function extractRunId(rec) {
+    if (typeof rec !== "object" || rec === null)
+        return undefined;
+    const r = rec;
+    // Top-level runId field (telemetry events carry it here)
+    if (typeof r.runId === "string")
+        return r.runId;
+    // Nested under details (future history.jsonl writers may use this)
+    if (typeof r.details === "object" && r.details !== null) {
+        const d = r.details;
+        if (typeof d.runId === "string")
+            return d.runId;
+    }
+    return undefined;
+}
+// ── Helper: get today's telemetry file path ──────────────────────────
+function todayTelemetryPath(projectRoot) {
+    const date = new Date().toISOString().slice(0, 10); // YYYY-MM-DD
+    return join(projectRoot, ".bober", "telemetry", `${date}.jsonl`);
+}
+// ── EventStreamManager ───────────────────────────────────────────────
+export class EventStreamManager {
+    server;
+    projectRoot;
+    defaultQueueBound;
+    subscriptions = new Map();
+    /** FileWatch entries keyed by absolute path. */
+    fileWatches = new Map();
+    /**
+     * Map from subscriptionId → set of watched file paths.
+     * Used to release watches on unsubscribe.
+     */
+    subFiles = new Map();
+    /** Telemetry date-poll interval (detects date roll-overs). */
+    telemetryPollTimer = null;
+    /** Current date string (YYYY-MM-DD) used to detect roll-over. */
+    currentTelemetryDate = new Date().toISOString().slice(0, 10);
+    constructor(server, projectRoot, defaultQueueBound = 1000) {
+        this.server = server;
+        this.projectRoot = projectRoot;
+        this.defaultQueueBound = defaultQueueBound;
+    }
+    // ── Public API ───────────────────────────────────────────────────
+    async subscribe(runId, opts = {}) {
+        const subscriptionId = randomUUID();
+        const startedAt = new Date().toISOString();
+        const queueBound = opts.queueBound ?? this.defaultQueueBound;
+        const sub = {
+            subscriptionId,
+            runId,
+            startedAt,
+            queue: [],
+            queueBound,
+            droppedSinceLastDelivery: 0,
+            flushing: false,
+        };
+        this.subscriptions.set(subscriptionId, sub);
+        this.subFiles.set(subscriptionId, new Set());
+        // Watch history.jsonl
+        const historyPath = join(this.projectRoot, ".bober", "history.jsonl");
+        await this.openWatch(historyPath, subscriptionId);
+        // Watch telemetry/<today>.jsonl (may not exist yet — openWatch handles this)
+        const telemetryPath = todayTelemetryPath(this.projectRoot);
+        await this.openWatch(telemetryPath, subscriptionId);
+        // Start telemetry poll timer if not already running
+        this.ensureTelemetryPoller();
+        // Backfill: if `since` is provided, deliver pre-existing events
+        if (opts.since !== undefined) {
+            await this.backfill(sub, historyPath, opts.since);
+            await this.backfill(sub, telemetryPath, opts.since);
+        }
+        return { subscriptionId, status: "subscribed", startedAt };
+    }
+    unsubscribe(subscriptionId) {
+        const sub = this.subscriptions.get(subscriptionId);
+        if (!sub)
+            return { ok: false };
+        this.subscriptions.delete(subscriptionId);
+        const files = this.subFiles.get(subscriptionId) ?? new Set();
+        this.subFiles.delete(subscriptionId);
+        for (const filePath of files) {
+            this.releaseWatch(filePath);
+        }
+        return { ok: true };
+    }
+    shutdown() {
+        // Cancel telemetry poller
+        if (this.telemetryPollTimer !== null) {
+            clearInterval(this.telemetryPollTimer);
+            this.telemetryPollTimer = null;
+        }
+        // Close all watchers
+        for (const fw of this.fileWatches.values()) {
+            try {
+                fw.watcher.close();
+            }
+            catch { /* ignore */ }
+        }
+        this.fileWatches.clear();
+        this.subscriptions.clear();
+        this.subFiles.clear();
+    }
+    // ── Watcher management ──────────────────────────────────────────
+    async openWatch(filePath, subscriptionId) {
+        const subFileSet = this.subFiles.get(subscriptionId);
+        if (!subFileSet)
+            return; // subscription was already removed
+        subFileSet.add(filePath);
+        if (this.fileWatches.has(filePath)) {
+            // Already watching — just increment refCount
+            this.fileWatches.get(filePath).refCount++;
+            return;
+        }
+        // Determine the initial offset (end of file, so we only see NEW appends)
+        let initialOffset = 0;
+        try {
+            const s = await stat(filePath);
+            initialOffset = s.size;
+        }
+        catch {
+            // File doesn't exist yet; start at 0 so we catch it when it's created
+        }
+        // Ensure parent directory exists so fs.watch doesn't throw
+        const parentDir = dirname(filePath);
+        try {
+            await mkdir(parentDir, { recursive: true });
+        }
+        catch {
+            // ignore
+        }
+        // Attempt to watch. If the file doesn't exist, watch the parent directory
+        // for creation, then switch to watching the file once it appears.
+        const fw = {
+            path: filePath,
+            watcher: null, // assigned below
+            offset: initialOffset,
+            refCount: 1,
+            partialLine: "",
+            chain: Promise.resolve(),
+        };
+        this.fileWatches.set(filePath, fw);
+        try {
+            // Try watching the file directly first (works if file exists)
+            const fileExists = await this.fileExists(filePath);
+            if (fileExists) {
+                fw.watcher = this.createWatcher(filePath, fw);
+            }
+            else {
+                // Watch parent directory for file creation
+                fw.watcher = this.createParentWatcher(filePath, parentDir, fw);
+            }
+        }
+        catch (err) {
+            process.stderr.write(`[event-stream] Failed to watch ${filePath}: ${err instanceof Error ? err.message : String(err)}\n`);
+            // Remove the broken watch entry
+            this.fileWatches.delete(filePath);
+            subFileSet.delete(filePath);
+        }
+    }
+    createWatcher(filePath, fw) {
+        const watcher = watch(filePath, { persistent: false }, (_eventType) => {
+            fw.chain = fw.chain.then(() => this.onFileEvent(filePath)).catch(() => { });
+        });
+        watcher.unref?.();
+        return watcher;
+    }
+    createParentWatcher(filePath, parentDir, fw) {
+        const filename = filePath.slice(parentDir.length + 1);
+        const watcher = watch(parentDir, { persistent: false }, (_eventType, changedFile) => {
+            if (changedFile === filename) {
+                // File appeared — switch to file watcher
+                fw.chain = fw.chain.then(async () => {
+                    const exists = await this.fileExists(filePath);
+                    if (exists && this.fileWatches.has(filePath)) {
+                        try {
+                            fw.watcher.close();
+                        }
+                        catch { /* ignore */ }
+                        fw.watcher = this.createWatcher(filePath, fw);
+                        // Also read any content that appeared
+                        await this.onFileEvent(filePath);
+                    }
+                }).catch(() => { });
+            }
+        });
+        watcher.unref?.();
+        return watcher;
+    }
+    releaseWatch(filePath) {
+        const fw = this.fileWatches.get(filePath);
+        if (!fw)
+            return;
+        fw.refCount--;
+        if (fw.refCount <= 0) {
+            try {
+                fw.watcher.close();
+            }
+            catch { /* ignore */ }
+            this.fileWatches.delete(filePath);
+        }
+    }
+    // ── File reading ────────────────────────────────────────────────
+    async fileExists(filePath) {
+        try {
+            await stat(filePath);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    async onFileEvent(filePath) {
+        const fw = this.fileWatches.get(filePath);
+        if (!fw)
+            return;
+        let fileStat;
+        try {
+            fileStat = await stat(filePath);
+        }
+        catch {
+            return; // file gone or not yet created
+        }
+        const fileSize = fileStat.size;
+        if (fileSize <= fw.offset)
+            return; // no new data (or truncated — ignore)
+        // Read only the new bytes
+        let newBytes;
+        try {
+            newBytes = await this.readFromOffset(filePath, fw.offset, fileSize - fw.offset);
+        }
+        catch {
+            return;
+        }
+        fw.offset = fileSize;
+        const rawText = fw.partialLine + newBytes.toString("utf-8");
+        const lines = rawText.split("\n");
+        // The last element may be incomplete (mid-append) — hold it back
+        fw.partialLine = lines.pop() ?? "";
+        for (const line of lines) {
+            const trimmed = line.trim();
+            if (!trimmed)
+                continue;
+            let rec;
+            try {
+                rec = JSON.parse(trimmed);
+            }
+            catch {
+                continue; // skip malformed lines
+            }
+            const runId = extractRunId(rec);
+            if (!runId)
+                continue; // sc-3-6: skip lines without runId
+            // Fan-out to matching subscriptions
+            for (const sub of this.subscriptions.values()) {
+                if (sub.runId === runId) {
+                    this.deliver(sub, rec);
+                }
+            }
+        }
+    }
+    readFromOffset(filePath, offset, length) {
+        return new Promise((resolve, reject) => {
+            fsOpen(filePath, "r", (openErr, fd) => {
+                if (openErr) {
+                    reject(openErr);
+                    return;
+                }
+                const buf = Buffer.alloc(length);
+                fsRead(fd, buf, 0, length, offset, (readErr, bytesRead) => {
+                    fsClose(fd, (closeErr) => {
+                        if (readErr) {
+                            reject(readErr);
+                            return;
+                        }
+                        if (closeErr) {
+                            // Non-fatal; just log and resolve
+                            process.stderr.write(`[event-stream] close fd error: ${closeErr.message}\n`);
+                        }
+                        resolve(buf.subarray(0, bytesRead));
+                    });
+                });
+            });
+        });
+    }
+    // ── Backfill ────────────────────────────────────────────────────
+    async backfill(sub, filePath, since) {
+        let content;
+        try {
+            content = await readFile(filePath, "utf-8");
+        }
+        catch {
+            return; // file may not exist yet
+        }
+        const lines = content.split("\n");
+        for (const line of lines) {
+            const trimmed = line.trim();
+            if (!trimmed)
+                continue;
+            let rec;
+            try {
+                rec = JSON.parse(trimmed);
+            }
+            catch {
+                continue;
+            }
+            const runId = extractRunId(rec);
+            if (!runId || runId !== sub.runId)
+                continue;
+            // Check timestamp > since
+            if (typeof rec === "object" && rec !== null) {
+                const r = rec;
+                if (typeof r.timestamp === "string" && r.timestamp > since) {
+                    this.deliver(sub, rec);
+                }
+            }
+        }
+    }
+    // ── Delivery / backpressure ─────────────────────────────────────
+    deliver(sub, event) {
+        sub.queue.push(event);
+        if (sub.queue.length > sub.queueBound) {
+            const overflow = sub.queue.length - sub.queueBound;
+            sub.queue.splice(0, overflow); // drop oldest
+            sub.droppedSinceLastDelivery += overflow;
+        }
+        // Defer flush via a resolved Promise microtask so that flush() does not start
+        // consuming events until the current synchronous batch of deliver() calls has
+        // fully completed. This ensures all overflow tracking is accurate before any
+        // notifications are sent (sc-3-3: exactly 1 dropped notification per overflow window).
+        void Promise.resolve().then(() => this.flush(sub));
+    }
+    async flush(sub) {
+        if (sub.flushing)
+            return;
+        sub.flushing = true;
+        try {
+            while (sub.queue.length > 0) {
+                const event = sub.queue.shift();
+                if (!this.subscriptions.has(sub.subscriptionId))
+                    break; // unsubscribed
+                await this.server.notification({
+                    method: NOTIF_EVENT,
+                    params: { subscriptionId: sub.subscriptionId, event },
+                });
+            }
+            if (sub.droppedSinceLastDelivery > 0) {
+                const count = sub.droppedSinceLastDelivery;
+                sub.droppedSinceLastDelivery = 0;
+                if (this.subscriptions.has(sub.subscriptionId)) {
+                    await this.server.notification({
+                        method: NOTIF_DROPPED,
+                        params: { subscriptionId: sub.subscriptionId, dropped: count },
+                    });
+                }
+            }
+        }
+        catch (err) {
+            process.stderr.write(`[event-stream] notification error: ${err instanceof Error ? err.message : String(err)}\n`);
+        }
+        finally {
+            sub.flushing = false;
+        }
+    }
+    // ── Telemetry date poller ───────────────────────────────────────
+    ensureTelemetryPoller() {
+        if (this.telemetryPollTimer !== null)
+            return;
+        this.telemetryPollTimer = setInterval(() => {
+            this.checkTelemetryDateRollover();
+        }, 5_000);
+        this.telemetryPollTimer.unref?.();
+    }
+    checkTelemetryDateRollover() {
+        const today = new Date().toISOString().slice(0, 10);
+        if (today === this.currentTelemetryDate)
+            return;
+        // Date rolled over — update watcher for all subscriptions
+        const oldPath = join(this.projectRoot, ".bober", "telemetry", `${this.currentTelemetryDate}.jsonl`);
+        const newPath = join(this.projectRoot, ".bober", "telemetry", `${today}.jsonl`);
+        this.currentTelemetryDate = today;
+        // Release old telemetry watchers and open new ones
+        for (const [subId, fileSet] of this.subFiles.entries()) {
+            if (fileSet.has(oldPath)) {
+                this.releaseWatch(oldPath);
+                fileSet.delete(oldPath);
+                // Open watch for the new date file
+                this.openWatch(newPath, subId).catch(() => { });
+            }
+        }
+    }
+}
+// ── Late-bound module singleton ──────────────────────────────────────
+let _manager = null;
+export function initEventStream(server, projectRoot, queueBound) {
+    _manager = new EventStreamManager(server, projectRoot, queueBound);
+    return _manager;
+}
+export function getEventStream() {
+    if (!_manager) {
+        throw new Error("EventStreamManager not initialized; call initEventStream(server, projectRoot) after server.connect().");
+    }
+    return _manager;
+}
+//# sourceMappingURL=event-stream.js.map

package/dist/mcp/event-stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"event-stream.js","sourceRoot":"","sources":["../../src/mcp/event-stream.ts"],"names":[],"mappings":"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"}

package/dist/mcp/external-client.d.ts

@@ -0,0 +1,38 @@
+/**
+ * ExternalMcpServer — manages one externally-spawned MCP server subprocess.
+ *
+ * Lifecycle:
+ *   - start(): spawn child via SDK StdioClientTransport, perform MCP handshake.
+ *   - listTools(): return tool descriptors from the server (cached after first call).
+ *   - callTool(name, args): invoke a tool, return its result.
+ *   - stop(): SIGTERM the child, wait up to 5s, SIGKILL if still alive.
+ *
+ * SECURITY: providerConfig.mcpEnv may contain API tokens. NEVER include the
+ * env contents in error messages, log lines, or returned errors. Only the
+ * provider NAME is safe to expose externally.
+ *
+ * Error isolation: ExternalMcpServer does NOT implement circuit-breaker or
+ * restart-on-crash logic. Observability MCPs are best-effort — a crashed
+ * provider is simply absent from the diagnoser's tool list for that spawn.
+ * The caller (mergeObsTools) uses Promise.allSettled to handle partial failure.
+ */
+import type { ObservabilityProvider } from "../config/schema.js";
+export interface ToolDescriptor {
+    name: string;
+    description?: string;
+    inputSchema?: unknown;
+}
+export declare class ExternalMcpServer {
+    private readonly provider;
+    private client;
+    private transport;
+    private toolsCache;
+    private stopping;
+    constructor(provider: ObservabilityProvider);
+    get name(): string;
+    start(): Promise<void>;
+    listTools(): Promise<ToolDescriptor[]>;
+    callTool(name: string, args: unknown): Promise<unknown>;
+    stop(): Promise<void>;
+}
+//# sourceMappingURL=external-client.d.ts.map

package/dist/mcp/external-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"external-client.d.ts","sourceRoot":"","sources":["../../src/mcp/external-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAIH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAEjE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,qBAAa,iBAAiB;IAMhB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IALrC,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,SAAS,CAAqC;IACtD,OAAO,CAAC,UAAU,CAAiC;IACnD,OAAO,CAAC,QAAQ,CAAS;gBAEI,QAAQ,EAAE,qBAAqB;IAE5D,IAAI,IAAI,IAAI,MAAM,CAEjB;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAuCtB,SAAS,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IActC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAUvD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAmC5B"}

package/dist/mcp/external-client.js

@@ -0,0 +1,121 @@
+/**
+ * ExternalMcpServer — manages one externally-spawned MCP server subprocess.
+ *
+ * Lifecycle:
+ *   - start(): spawn child via SDK StdioClientTransport, perform MCP handshake.
+ *   - listTools(): return tool descriptors from the server (cached after first call).
+ *   - callTool(name, args): invoke a tool, return its result.
+ *   - stop(): SIGTERM the child, wait up to 5s, SIGKILL if still alive.
+ *
+ * SECURITY: providerConfig.mcpEnv may contain API tokens. NEVER include the
+ * env contents in error messages, log lines, or returned errors. Only the
+ * provider NAME is safe to expose externally.
+ *
+ * Error isolation: ExternalMcpServer does NOT implement circuit-breaker or
+ * restart-on-crash logic. Observability MCPs are best-effort — a crashed
+ * provider is simply absent from the diagnoser's tool list for that spawn.
+ * The caller (mergeObsTools) uses Promise.allSettled to handle partial failure.
+ */
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+export class ExternalMcpServer {
+    provider;
+    client = null;
+    transport = null;
+    toolsCache = null;
+    stopping = false;
+    constructor(provider) {
+        this.provider = provider;
+    }
+    get name() {
+        return this.provider.name;
+    }
+    async start() {
+        if (this.client)
+            return; // idempotent
+        // SECURITY: merge process.env FIRST so the child inherits PATH and other
+        // essentials; then overlay provider.mcpEnv. The merged object is passed to
+        // the child only — it is never logged or included in error messages.
+        this.transport = new StdioClientTransport({
+            command: this.provider.mcpCommand,
+            args: this.provider.mcpArgs ?? [],
+            env: {
+                ...process.env,
+                ...(this.provider.mcpEnv ?? {}),
+            },
+            stderr: "pipe",
+        });
+        this.client = new Client({ name: "agent-bober-obs-client", version: "0.13.0" }, { capabilities: {} });
+        try {
+            await this.client.connect(this.transport);
+        }
+        catch (err) {
+            // SECURITY: do NOT include provider.mcpEnv in the rethrown error.
+            const msg = err instanceof Error ? err.message : String(err);
+            // Strip anything that looks like an env var assignment (KEY=VALUE).
+            const sanitized = msg.replace(/\b[A-Z_][A-Z0-9_]*=\S+/g, "[redacted]");
+            this.client = null;
+            this.transport = null;
+            // SECURITY: message is sanitized; the original error is attached as cause
+            // for debug-time stack traces but must NOT be logged externally.
+            throw new Error(`ExternalMcpServer "${this.provider.name}" failed to connect: ${sanitized}`, { cause: err });
+        }
+    }
+    async listTools() {
+        if (!this.client) {
+            throw new Error(`provider "${this.provider.name}" not started`);
+        }
+        if (this.toolsCache)
+            return this.toolsCache;
+        const res = await this.client.listTools();
+        this.toolsCache = res.tools.map((t) => ({
+            name: t.name,
+            description: t.description,
+            inputSchema: t.inputSchema,
+        }));
+        return this.toolsCache;
+    }
+    async callTool(name, args) {
+        if (!this.client) {
+            throw new Error(`provider "${this.provider.name}" not started`);
+        }
+        return await this.client.callTool({
+            name,
+            arguments: args ?? {},
+        });
+    }
+    async stop() {
+        if (this.stopping)
+            return;
+        this.stopping = true;
+        // SDK Client.close() closes the transport which sends SIGTERM to the child.
+        // Wrap with a 5s timeout + SIGKILL fallback as required by s16-c3.
+        const clientRef = this.client;
+        const transportRef = this.transport;
+        this.client = null;
+        this.transport = null;
+        if (!clientRef)
+            return;
+        await new Promise((resolve) => {
+            const timer = setTimeout(() => {
+                // The SDK transport exposes the child's pid via the `pid` getter.
+                // Use process.kill() as the SIGKILL fallback.
+                const pid = transportRef?.pid;
+                if (pid != null) {
+                    try {
+                        process.kill(pid, "SIGKILL");
+                    }
+                    catch {
+                        // already dead — ignore
+                    }
+                }
+                resolve();
+            }, 5_000);
+            void clientRef.close().catch(() => { }).then(() => {
+                clearTimeout(timer);
+                resolve();
+            });
+        });
+    }
+}
+//# sourceMappingURL=external-client.js.map

package/dist/mcp/external-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"external-client.js","sourceRoot":"","sources":["../../src/mcp/external-client.ts"],"names":[],"mappings":"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"}