@ouro.bot/cli 0.1.0-alpha.29 → 0.1.0-alpha.30

package/changelog.json

@@ -1,6 +1,13 @@
 {
   "_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.30",
+      "changes": [
+        "BlueBubbles reply threads now stay inside one shared chat trunk instead of creating separate persisted mini-sessions, so Slugger keeps parent-chat awareness and active work when you switch between threaded and top-level replies.",
+        "BlueBubbles now injects explicit current-turn thread scope metadata into inbound messages and automatically removes obsolete per-thread session artifacts that used to cause mid-task resets like 'hiya, what do ya need help with?'"
+      ]
+    },
     {
       "version": "0.1.0-alpha.29",
       "changes": [

package/dist/senses/bluebubbles-model.js

@@ -39,6 +39,7 @@ function extractChatIdentifierFromGuid(chatGuid) {
     return parts.length >= 3 ? parts[2]?.trim() || undefined : undefined;
 }
 function buildChatRef(data, threadOriginatorGuid) {
+    void threadOriginatorGuid;
     const chats = Array.isArray(data.chats) ? data.chats : [];
     const chat = asRecord(chats[0]) ?? null;
     const chatGuid = readString(chat, "guid");
@@ -48,12 +49,9 @@ function buildChatRef(data, threadOriginatorGuid) {
     const displayName = readString(chat, "displayName")?.trim() || undefined;
     const style = readNumber(chat, "style");
     const isGroup = style === 43 || (chatGuid?.includes(";+;") ?? false) || Boolean(displayName);
-    const baseKey = chatGuid?.trim()
+    const sessionKey = chatGuid?.trim()
         ? `chat:${chatGuid.trim()}`
         : `chat_identifier:${(chatIdentifier ?? "unknown").trim()}`;
-    const sessionKey = threadOriginatorGuid?.trim()
-        ? `${baseKey}:thread:${threadOriginatorGuid.trim()}`
-        : baseKey;
     return {
         chatGuid: chatGuid?.trim() || undefined,
         chatIdentifier: chatIdentifier?.trim() || undefined,

package/dist/senses/bluebubbles-session-cleanup.js

@@ -0,0 +1,73 @@
+"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.cleanupObsoleteBlueBubblesThreadSessions = cleanupObsoleteBlueBubblesThreadSessions;
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
+const runtime_1 = require("../nerves/runtime");
+function cleanupObsoleteBlueBubblesThreadSessions(trunkSessionPath) {
+    const normalized = trunkSessionPath.trim();
+    if (!normalized.endsWith(".json"))
+        return [];
+    const trunkName = path.basename(normalized);
+    if (trunkName.includes("_thread_"))
+        return [];
+    if (!fs.existsSync(normalized))
+        return [];
+    const dir = path.dirname(normalized);
+    const prefix = trunkName.slice(0, -".json".length);
+    const removed = [];
+    for (const entry of fs.readdirSync(dir)) {
+        if (!entry.endsWith(".json"))
+            continue;
+        if (!entry.startsWith(`${prefix}_thread_`))
+            continue;
+        const target = path.join(dir, entry);
+        fs.rmSync(target, { force: true });
+        removed.push(target);
+    }
+    if (removed.length > 0) {
+        (0, runtime_1.emitNervesEvent)({
+            component: "senses",
+            event: "senses.bluebubbles_thread_lane_cleanup",
+            message: "removed obsolete bluebubbles thread-lane sessions",
+            meta: {
+                trunkSessionPath: normalized,
+                removedCount: removed.length,
+            },
+        });
+    }
+    return removed;
+}

package/dist/senses/bluebubbles.js

@@ -51,6 +51,7 @@ const runtime_1 = require("../nerves/runtime");
 const bluebubbles_model_1 = require("./bluebubbles-model");
 const bluebubbles_client_1 = require("./bluebubbles-client");
 const bluebubbles_mutation_log_1 = require("./bluebubbles-mutation-log");
+const bluebubbles_session_cleanup_1 = require("./bluebubbles-session-cleanup");
 const debug_activity_1 = require("./debug-activity");
 const defaultDeps = {
     getAgentName: identity_1.getAgentName,
@@ -84,15 +85,27 @@ function resolveFriendParams(event) {
     };
 }
 function buildInboundText(event) {
+    const metadataPrefix = buildConversationScopePrefix(event);
     const baseText = event.repairNotice?.trim()
         ? `${event.textForAgent}\n[${event.repairNotice.trim()}]`
         : event.textForAgent;
-    if (!event.chat.isGroup)
-        return baseText;
+    if (!event.chat.isGroup) {
+        return metadataPrefix ? `${metadataPrefix}\n${baseText}` : baseText;
+    }
+    const scopedText = metadataPrefix ? `${metadataPrefix}\n${baseText}` : baseText;
     if (event.kind === "mutation") {
-        return `${event.sender.displayName} ${baseText}`;
+        return `${event.sender.displayName} ${scopedText}`;
+    }
+    return `${event.sender.displayName}: ${scopedText}`;
+}
+function buildConversationScopePrefix(event) {
+    if (event.kind !== "message") {
+        return "";
     }
-    return `${event.sender.displayName}: ${baseText}`;
+    if (event.threadOriginatorGuid?.trim()) {
+        return `[conversation scope: existing chat trunk | current turn: thread reply | thread id: ${event.threadOriginatorGuid.trim()}]`;
+    }
+    return "[conversation scope: existing chat trunk | current turn: top-level]";
 }
 function buildInboundContent(event) {
     const text = buildInboundText(event);
@@ -299,6 +312,21 @@ async function handleBlueBubblesEvent(payload, deps = {}) {
     };
     const friendId = context.friend.id;
     const sessPath = resolvedDeps.sessionPath(friendId, "bluebubbles", event.chat.sessionKey);
+    try {
+        (0, bluebubbles_session_cleanup_1.cleanupObsoleteBlueBubblesThreadSessions)(sessPath);
+    }
+    catch (error) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "senses",
+            event: "senses.bluebubbles_thread_lane_cleanup_error",
+            message: "failed to clean up obsolete bluebubbles thread-lane sessions",
+            meta: {
+                sessionPath: sessPath,
+                reason: error instanceof Error ? error.message : String(error),
+            },
+        });
+    }
     const existing = resolvedDeps.loadSession(sessPath);
     const messages = existing?.messages && existing.messages.length > 0
         ? existing.messages

package/package.json

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