@ouro.bot/cli 0.1.0-alpha.489 → 0.1.0-alpha.490

package/README.md

@@ -22,7 +22,9 @@ Current first-class senses:
 - `cli`
 - `teams`
 - `bluebubbles`
-- `mcp`
+- `mail`
+
+(MCP is a bridge for developer tools — a separate channel, not a sense. See `src/heart/mcp/` for the implementation.)
 
 Current provider ids:
 
@@ -45,7 +47,7 @@ The shared harness lives in `src/`:
 - `src/repertoire/`
   Tool registry (split into category modules: files, shell, notes, bridge, session, continuity, flow, surface, config, and sense-specific tools), coding orchestration, task tools, shared API client, and integration clients (Graph, ADO, GitHub).
 - `src/senses/`
-  CLI (with TUI in senses/cli/), Teams, BlueBubbles (in senses/bluebubbles/), MCP, activity transport, inner-dialog orchestration, and contextual heartbeat.
+  CLI (with TUI in senses/cli/), Teams, BlueBubbles (in senses/bluebubbles/), Mail (in senses/mail.ts), activity transport, inner-dialog orchestration, and contextual heartbeat. The MCP bridge is at `src/heart/mcp/`, not here.
 - `src/nerves/`
   Structured runtime logging and coverage-audit infrastructure.
 - `src/__tests__/`
@@ -267,4 +269,3 @@ See `skills/configure-dev-tools.md` for the full tool inventory and troubleshoot
 ## A Note To Future Maintainers
 
 If you discover a doc that lies, fix it or remove it. Accuracy is a kindness. A future agent should not have to untangle a fossil record just to understand where their hands are.
-# Production SPA serving

package/changelog.json

@@ -1,6 +1,12 @@
 {
   "_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.490",
+      "changes": [
+        "BlueBubbles group echo self-talk fix. The BB ingest path previously relied solely on the payload's `isFromMe` flag to detect the agent's own outbound messages — but in groups, BlueBubbles sometimes broadcasts the echo back through the webhook with that flag missing or false. Without a fallback, the agent would ingest its own message and reply to it (the user reported this in a group with their friend Rach: 'Slugger talking to himself'). New `bluebubbles.ownHandles` config field accepts the agent's known iMessage handles (phone numbers in any formatting, or email addresses); a fallback guard at the head of `handleBlueBubblesNormalizedEvent` filters any event whose `sender.externalId` matches a configured handle (case-insensitive, with phone-number normalization across +/space/paren/dash differences) and emits a `senses.bluebubbles_self_handle_filtered` warn-level nerve event so the case is observable. Direct chats are unaffected (their echoes already carry `isFromMe: true` reliably). Also folds in three trivial cleanups surfaced by the full-system audit: removed a stray `# Production SPA serving` heading from the README, removed a vestigial `// getPhrases removed` comment in bluebubbles/index.ts, and removed two unreachable `throw new Error('unreachable')` statements after `process.exit(1)` in heart/core.ts (process.exit returns `never` so TS already knows control doesn't continue)."
+      ]
+    },
     {
       "version": "0.1.0-alpha.489",
       "changes": [

package/dist/heart/config.js

@@ -92,6 +92,7 @@ const DEFAULT_LOCAL_RUNTIME_CONFIG = {
         serverUrl: "",
         password: "",
         accountId: "default",
+        ownHandles: [],
     },
     bluebubblesChannel: {
         port: 18790,
@@ -284,17 +285,24 @@ function getTeamsChannelConfig() {
 }
 function getBlueBubblesConfig() {
     const config = loadConfig();
-    const { serverUrl, password, accountId } = config.bluebubbles;
+    const { serverUrl, password, accountId, ownHandles } = config.bluebubbles;
     if (!serverUrl.trim()) {
         throw new Error("bluebubbles.serverUrl is required in this machine's agent-vault runtime config. Run `ouro connect bluebubbles --agent <agent>`.");
     }
     if (!password.trim()) {
         throw new Error("bluebubbles.password is required in this machine's agent-vault runtime config. Run `ouro connect bluebubbles --agent <agent>`.");
     }
+    const normalizedHandles = [];
+    for (const handle of ownHandles) {
+        const trimmed = handle.trim();
+        if (trimmed.length > 0)
+            normalizedHandles.push(trimmed);
+    }
     return {
         serverUrl: serverUrl.trim(),
         password: password.trim(),
         accountId: accountId.trim() || "default",
+        ownHandles: normalizedHandles,
     };
 }
 function getBlueBubblesChannelConfig() {

package/dist/heart/core.js

@@ -121,7 +121,6 @@ async function getProviderRuntime(facing = "human") {
         // eslint-disable-next-line no-console -- pre-boot guard: provider init failure
         console.error(`\n[fatal] ${msg}\n`);
         process.exit(1);
-        throw new Error("unreachable");
     }
     if (!_providerRuntimes[facing]) {
         (0, runtime_1.emitNervesEvent)({
@@ -132,7 +131,6 @@ async function getProviderRuntime(facing = "human") {
             meta: {},
         });
         process.exit(1);
-        throw new Error("unreachable");
     }
     return _providerRuntimes[facing].runtime;
 }

package/dist/heart/session-events.js

@@ -963,7 +963,10 @@ function appendEvictedToArchive(sessPath, evictedEvents) {
     }
 }
 function appendSyntheticAssistantEvent(envelope, content, recordedAt) {
-    const sequence = envelope.events.length + 1;
+    // Use nextEventSequence(events) instead of `events.length + 1` so any gap
+    // (from pruning, archive replay, or self-heal dedup) cannot collide with
+    // an existing event id. Same fix pattern as line 1046.
+    const sequence = nextEventSequence(envelope.events);
     const event = buildEventFromMessage({ role: "assistant", content }, sequence, recordedAt, "synthetic", null, null);
     return {
         ...envelope,

package/dist/senses/bluebubbles/index.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enrichReactionText = enrichReactionText;
 exports.createStatusBatcher = createStatusBatcher;
+exports.isAgentSelfHandle = isAgentSelfHandle;
 exports.handleBlueBubblesEvent = handleBlueBubblesEvent;
 exports.catchUpMissedBlueBubblesMessages = catchUpMissedBlueBubblesMessages;
 exports.recoverCapturedBlueBubblesInboundMessages = recoverCapturedBlueBubblesInboundMessages;
@@ -60,7 +61,6 @@ const channel_1 = require("../../mind/friends/channel");
 const pending_1 = require("../../mind/pending");
 const prompt_1 = require("../../mind/prompt");
 const mcp_manager_1 = require("../../repertoire/mcp-manager");
-// getPhrases removed — no longer needed after debug-activity cleanup
 const runtime_1 = require("../../nerves/runtime");
 const proactive_content_guard_1 = require("../proactive-content-guard");
 const model_1 = require("./model");
@@ -159,6 +159,7 @@ const defaultDeps = {
     createFriendStore: () => new store_file_1.FileFriendStore(path.join((0, identity_1.getAgentRoot)(), "friends")),
     createFriendResolver: (store, params) => new resolver_1.FriendResolver(store, params),
     createServer: http.createServer,
+    getOwnHandles: () => (0, config_1.getBlueBubblesConfig)().ownHandles,
 };
 const BLUEBUBBLES_RUNTIME_SYNC_INTERVAL_MS = 30_000;
 const BLUEBUBBLES_CATCHUP_PAGE_SIZE = 50;
@@ -607,6 +608,32 @@ function isWebhookPasswordValid(url, expectedPassword) {
     const provided = url.searchParams.get("password");
     return !provided || provided === expectedPassword;
 }
+function normalizeHandleForSelfMatch(handle) {
+    const trimmed = handle.trim().toLowerCase();
+    if (!trimmed)
+        return "";
+    // Phone-shaped: strip everything but digits so +1 (415) 555-... matches 14155550000.
+    if (/[+\d]/.test(trimmed) && !trimmed.includes("@")) {
+        const digits = trimmed.replace(/\D/g, "");
+        if (digits.length >= 7)
+            return digits;
+    }
+    return trimmed;
+}
+function isAgentSelfHandle(senderExternalId, ownHandles) {
+    if (!senderExternalId || !senderExternalId.trim())
+        return false;
+    const target = normalizeHandleForSelfMatch(senderExternalId);
+    /* v8 ignore start -- target is non-empty by construction since senderExternalId was just verified non-whitespace */
+    if (!target)
+        return false;
+    /* v8 ignore stop */
+    for (const own of ownHandles) {
+        if (normalizeHandleForSelfMatch(own) === target)
+            return true;
+    }
+    return false;
+}
 async function handleBlueBubblesNormalizedEvent(event, resolvedDeps, source) {
     const client = resolvedDeps.createClient();
     const agentName = resolvedDeps.getAgentName();
@@ -622,6 +649,25 @@ async function handleBlueBubblesNormalizedEvent(event, resolvedDeps, source) {
         });
         return { handled: true, notifiedAgent: false, kind: event.kind, reason: "from_me" };
     }
+    // Fallback self-detection: BlueBubbles sometimes broadcasts a group-chat
+    // outbound message back through the webhook with `isFromMe` missing/false.
+    // Without this guard the agent ingests its own message and replies to it
+    // ("Slugger talking to himself"). Compare the sender's externalId against
+    // the agent's known iMessage handles.
+    if (isAgentSelfHandle(event.sender.externalId, resolvedDeps.getOwnHandles())) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "senses",
+            event: "senses.bluebubbles_self_handle_filtered",
+            message: "filtered bluebubbles event whose sender matched an agent-owned handle (isFromMe was missing/false)",
+            meta: {
+                messageGuid: event.messageGuid,
+                kind: event.kind,
+                senderExternalId: event.sender.externalId,
+            },
+        });
+        return { handled: true, notifiedAgent: false, kind: event.kind, reason: "from_me" };
+    }
     if (event.kind === "mutation") {
         try {
             resolvedDeps.recordMutation(resolvedDeps.getAgentName(), event);

package/package.json

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