@ouro.bot/cli 0.1.0-alpha.32 → 0.1.0-alpha.321

package/dist/senses/{bluebubbles-client.js → bluebubbles/client.js}

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBlueBubblesClient = createBlueBubblesClient;
 const node_crypto_1 = require("node:crypto");
-const config_1 = require("../heart/config");
-const identity_1 = require("../heart/identity");
-const runtime_1 = require("../nerves/runtime");
-const bluebubbles_model_1 = require("./bluebubbles-model");
-const bluebubbles_media_1 = require("./bluebubbles-media");
+const config_1 = require("../../heart/config");
+const identity_1 = require("../../heart/identity");
+const runtime_1 = require("../../nerves/runtime");
+const minimax_1 = require("../../heart/providers/minimax");
+const minimax_vlm_1 = require("../../heart/providers/minimax-vlm");
+const model_1 = require("./model");
+const media_1 = require("./media");
 function buildBlueBubblesApiUrl(baseUrl, endpoint, password) {
     const root = baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`;
     const url = new URL(endpoint.replace(/^\//, ""), root);
@@ -170,6 +172,12 @@ function applyRepairNotice(event, notice) {
         repairNotice: notice,
     };
 }
+function hasRecoverableMessageContent(event) {
+    return event.kind === "message"
+        && (event.textForAgent.trim().length > 0
+            || event.attachments.length > 0
+            || event.hasPayloadData);
+}
 function hydrateTextForAgent(event, rawData) {
     if (event.kind !== "message") {
         return { ...event, requiresRepair: false };
@@ -323,6 +331,40 @@ function createBlueBubblesClient(config = (0, config_1.getBlueBubblesConfig)(),
                 throw new Error(`BlueBubbles read failed (${response.status}): ${errorText || "unknown"}`);
             }
         },
+        async checkHealth() {
+            const url = buildBlueBubblesApiUrl(config.serverUrl, "/api/v1/message/count", config.password);
+            (0, runtime_1.emitNervesEvent)({
+                component: "senses",
+                event: "senses.bluebubbles_healthcheck_start",
+                message: "probing bluebubbles upstream health",
+                meta: { serverUrl: config.serverUrl },
+            });
+            const response = await fetch(url, {
+                method: "GET",
+                signal: AbortSignal.timeout(channelConfig.requestTimeoutMs),
+            });
+            if (!response.ok) {
+                const errorText = await response.text().catch(() => "");
+                (0, runtime_1.emitNervesEvent)({
+                    level: "warn",
+                    component: "senses",
+                    event: "senses.bluebubbles_healthcheck_error",
+                    message: "bluebubbles upstream health probe failed",
+                    meta: {
+                        serverUrl: config.serverUrl,
+                        status: response.status,
+                        reason: errorText || "unknown",
+                    },
+                });
+                throw new Error(`BlueBubbles upstream health check failed (${response.status}): ${errorText || "unknown"}`);
+            }
+            (0, runtime_1.emitNervesEvent)({
+                component: "senses",
+                event: "senses.bluebubbles_healthcheck_end",
+                message: "bluebubbles upstream health probe succeeded",
+                meta: { serverUrl: config.serverUrl },
+            });
+        },
         async repairEvent(event) {
             if (!event.requiresRepair) {
                 (0, runtime_1.emitNervesEvent)({
@@ -337,6 +379,7 @@ function createBlueBubblesClient(config = (0, config_1.getBlueBubblesConfig)(),
                 return event;
             }
             (0, runtime_1.emitNervesEvent)({
+                level: "warn",
                 component: "senses",
                 event: "senses.bluebubbles_repair_start",
                 message: "repairing bluebubbles event by guid",
@@ -383,16 +426,57 @@ function createBlueBubblesClient(config = (0, config_1.getBlueBubblesConfig)(),
                     });
                     return repaired;
                 }
-                const normalized = (0, bluebubbles_model_1.normalizeBlueBubblesEvent)({
+                const normalized = (0, model_1.normalizeBlueBubblesEvent)({
                     type: event.eventType,
                     data,
                 });
-                let hydrated = hydrateTextForAgent(normalized, data);
+                const recoveredMessage = event.kind === "mutation"
+                    && !event.shouldNotifyAgent
+                    ? (0, model_1.normalizeBlueBubblesEvent)({
+                        type: "new-message",
+                        data,
+                    })
+                    : null;
+                let hydrated = recoveredMessage && hasRecoverableMessageContent(recoveredMessage)
+                    ? hydrateTextForAgent(recoveredMessage, data)
+                    : hydrateTextForAgent(normalized, data);
                 if (hydrated.kind === "message" &&
                     hydrated.balloonBundleId !== "com.apple.messages.URLBalloonProvider" &&
                     hydrated.attachments.length > 0) {
-                    const media = await (0, bluebubbles_media_1.hydrateBlueBubblesAttachments)(hydrated.attachments, config, channelConfig, {
-                        preferAudioInput: providerSupportsAudioInput((0, identity_1.loadAgentConfig)().provider),
+                    const agentConfig = (0, identity_1.loadAgentConfig)();
+                    const chatModel = agentConfig.humanFacing.model;
+                    const chatProvider = agentConfig.humanFacing.provider;
+                    const vlmDescribe = async (params) => {
+                        if (chatProvider !== "minimax") {
+                            throw new Error("VLM fallback requires a minimax credential for this agent — " +
+                                "configure one or switch to a vision-capable chat model");
+                        }
+                        const { apiKey } = (0, config_1.getMinimaxConfig)();
+                        if (!apiKey) {
+                            throw new Error("VLM fallback: minimax API key not found in secrets.json — " +
+                                "re-run credential setup or ask the user to add a minimax key");
+                        }
+                        return (0, minimax_vlm_1.minimaxVlmDescribe)({
+                            apiKey,
+                            prompt: params.prompt,
+                            imageDataUrl: params.imageDataUrl,
+                            baseURL: minimax_1.MINIMAX_PROVIDER_BASE_URL,
+                            attachmentGuid: params.attachmentGuid,
+                            mimeType: params.mimeType,
+                            chatModel: params.chatModel,
+                        });
+                    };
+                    // VLM prompt context wants the user's raw inbound text — NOT
+                    // the agent-facing rendering, which now carries the attachment
+                    // marker after the B2 fix. Pull it from the source payload.
+                    const rawUserText = typeof data.text === "string"
+                        ? (data.text).trim()
+                        : "";
+                    const media = await (0, media_1.hydrateBlueBubblesAttachments)(hydrated.attachments, config, channelConfig, {
+                        preferAudioInput: providerSupportsAudioInput(chatProvider),
+                        chatModel,
+                        vlmDescribe,
+                        userText: rawUserText,
                     });
                     const transcriptSuffix = media.transcriptAdditions.map((entry) => `[${entry}]`).join("\n");
                     const noticeSuffix = media.notices.map((entry) => `[${entry}]`).join("\n");
@@ -404,6 +488,7 @@ function createBlueBubblesClient(config = (0, config_1.getBlueBubblesConfig)(),
                     };
                 }
                 (0, runtime_1.emitNervesEvent)({
+                    level: "warn",
                     component: "senses",
                     event: "senses.bluebubbles_repair_end",
                     message: "bluebubbles event repaired",
@@ -411,6 +496,7 @@ function createBlueBubblesClient(config = (0, config_1.getBlueBubblesConfig)(),
                         kind: hydrated.kind,
                         messageGuid: hydrated.messageGuid,
                         repairedFrom: event.kind,
+                        promotedFromMutation: event.kind === "mutation" && hydrated.kind === "message",
                     },
                 });
                 return hydrated;
@@ -430,5 +516,53 @@ function createBlueBubblesClient(config = (0, config_1.getBlueBubblesConfig)(),
                 return applyRepairNotice(event, `BlueBubbles repair failed: ${reason}`);
             }
         },
+        async getMessageText(messageGuid) {
+            const url = buildRepairUrl(config.serverUrl, messageGuid, config.password);
+            try {
+                const response = await fetch(url, {
+                    method: "GET",
+                    signal: AbortSignal.timeout(channelConfig.requestTimeoutMs),
+                });
+                if (!response.ok) {
+                    (0, runtime_1.emitNervesEvent)({
+                        level: "warn",
+                        component: "senses",
+                        event: "senses.bluebubbles_get_message_text_error",
+                        message: "failed to fetch message text",
+                        meta: { messageGuid, status: response.status },
+                    });
+                    return null;
+                }
+                const payload = await parseJsonBody(response);
+                const data = extractRepairData(payload);
+                if (!data || typeof data.text !== "string") {
+                    (0, runtime_1.emitNervesEvent)({
+                        level: "warn",
+                        component: "senses",
+                        event: "senses.bluebubbles_get_message_text_error",
+                        message: "message payload missing text field",
+                        meta: { messageGuid, hasData: !!data, textType: data ? typeof data.text : "n/a" },
+                    });
+                    return null;
+                }
+                (0, runtime_1.emitNervesEvent)({
+                    component: "senses",
+                    event: "senses.bluebubbles_get_message_text",
+                    message: "fetched message text by guid",
+                    meta: { messageGuid },
+                });
+                return data.text.trim() || null;
+            }
+            catch (error) {
+                (0, runtime_1.emitNervesEvent)({
+                    level: "warn",
+                    component: "senses",
+                    event: "senses.bluebubbles_get_message_text_error",
+                    message: "exception fetching message text",
+                    meta: { messageGuid, reason: error instanceof Error ? error.message : String(error) },
+                });
+                return null;
+            }
+        },
     };
 }

package/dist/senses/bluebubbles/entry.js

@@ -0,0 +1,13 @@
+"use strict";
+// Thin entrypoint for `npm run bluebubbles` / `node dist/senses/bluebubbles/entry.js --agent <name>`.
+// Separated from index.ts so the BlueBubbles adapter stays testable.
+Object.defineProperty(exports, "__esModule", { value: true });
+if (!process.argv.includes("--agent")) {
+    // eslint-disable-next-line no-console -- pre-boot guard: --agent check before imports
+    console.error("Missing required --agent <name> argument.\nUsage: node dist/senses/bluebubbles/entry.js --agent ouroboros");
+    process.exit(1);
+}
+const index_1 = require("./index");
+const runtime_logging_1 = require("../../heart/daemon/runtime-logging");
+(0, runtime_logging_1.configureDaemonRuntimeLogger)("bluebubbles");
+(0, index_1.startBlueBubblesApp)();

package/dist/senses/bluebubbles/inbound-log.js

@@ -0,0 +1,113 @@
+"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.getBlueBubblesInboundLogPath = getBlueBubblesInboundLogPath;
+exports.hasRecordedBlueBubblesInbound = hasRecordedBlueBubblesInbound;
+exports.recordBlueBubblesInbound = recordBlueBubblesInbound;
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
+const config_1 = require("../../heart/config");
+const identity_1 = require("../../heart/identity");
+const runtime_1 = require("../../nerves/runtime");
+function getBlueBubblesInboundLogPath(agentName, sessionKey) {
+    return path.join((0, identity_1.getAgentRoot)(agentName), "state", "senses", "bluebubbles", "inbound", `${(0, config_1.sanitizeKey)(sessionKey)}.ndjson`);
+}
+function readEntries(filePath) {
+    try {
+        const raw = fs.readFileSync(filePath, "utf-8");
+        return raw
+            .split("\n")
+            .map((line) => line.trim())
+            .filter(Boolean)
+            .map((line) => JSON.parse(line))
+            .filter((entry) => typeof entry.messageGuid === "string" && typeof entry.sessionKey === "string");
+    }
+    catch {
+        return [];
+    }
+}
+function hasRecordedBlueBubblesInbound(agentName, sessionKey, messageGuid) {
+    if (!messageGuid.trim())
+        return false;
+    const filePath = getBlueBubblesInboundLogPath(agentName, sessionKey);
+    return readEntries(filePath).some((entry) => entry.messageGuid === messageGuid);
+}
+function recordBlueBubblesInbound(agentName, event, source) {
+    const filePath = getBlueBubblesInboundLogPath(agentName, event.chat.sessionKey);
+    try {
+        fs.mkdirSync(path.dirname(filePath), { recursive: true });
+        if (event.messageGuid.trim() && readEntries(filePath).some((entry) => entry.messageGuid === event.messageGuid)) {
+            return filePath;
+        }
+        fs.appendFileSync(filePath, JSON.stringify({
+            recordedAt: new Date(event.timestamp).toISOString(),
+            messageGuid: event.messageGuid,
+            chatGuid: event.chat.chatGuid ?? null,
+            chatIdentifier: event.chat.chatIdentifier ?? null,
+            sessionKey: event.chat.sessionKey,
+            textForAgent: event.textForAgent,
+            source,
+        }) + "\n", "utf-8");
+    }
+    catch (error) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "senses",
+            event: "senses.bluebubbles_inbound_log_error",
+            message: "failed to record bluebubbles inbound sidecar log",
+            meta: {
+                agentName,
+                messageGuid: event.messageGuid,
+                sessionKey: event.chat.sessionKey,
+                reason: error instanceof Error ? error.message : String(error),
+            },
+        });
+        return filePath;
+    }
+    (0, runtime_1.emitNervesEvent)({
+        level: "warn",
+        component: "senses",
+        event: "senses.bluebubbles_inbound_logged",
+        message: "recorded bluebubbles inbound message to sidecar log",
+        meta: {
+            agentName,
+            messageGuid: event.messageGuid,
+            sessionKey: event.chat.sessionKey,
+            source,
+            path: filePath,
+        },
+    });
+    return filePath;
+}