@ouro.bot/cli 0.1.0-alpha.519 → 0.1.0-alpha.520

package/dist/repertoire/tools-session.js

@@ -416,6 +416,7 @@ exports.sessionToolDefinitions = [
                 messageCount: count,
                 trustLevel: ctx?.context?.friend?.trustLevel,
                 summarize: ctx?.summarize,
+                archiveFallback: true,
             });
             if (sessionTail.kind === "missing") {
                 return NO_SESSION_FOUND_MESSAGE;

package/dist/senses/bluebubbles/entry.js

@@ -51,13 +51,17 @@ const runtime_1 = require("../../nerves/runtime");
     message: "booting BlueBubbles entrypoint",
     meta: { entry: "bluebubbles", agentName },
 });
-Promise.resolve().then(() => __importStar(require("../../heart/runtime-credentials"))).then(async ({ refreshMachineRuntimeCredentialConfig, refreshRuntimeCredentialConfig }) => {
-    await refreshRuntimeCredentialConfig(agentName, { preserveCachedOnFailure: true }).catch(() => undefined);
+Promise.resolve().then(() => __importStar(require("../../heart/runtime-credentials"))).then(async ({ readMachineRuntimeCredentialConfig, refreshMachineRuntimeCredentialConfig, refreshRuntimeCredentialConfig, waitForRuntimeCredentialBootstrap, }) => {
+    await waitForRuntimeCredentialBootstrap(agentName);
     const { loadOrCreateMachineIdentity } = await Promise.resolve().then(() => __importStar(require("../../heart/machine-identity")));
     const machine = loadOrCreateMachineIdentity();
-    await refreshMachineRuntimeCredentialConfig(agentName, machine.machineId, { preserveCachedOnFailure: true }).catch(() => undefined);
+    const machineConfig = readMachineRuntimeCredentialConfig(agentName);
+    if (!machineConfig.ok) {
+        await refreshMachineRuntimeCredentialConfig(agentName, machine.machineId, { preserveCachedOnFailure: true }).catch(() => undefined);
+    }
     const { startBlueBubblesApp } = await Promise.resolve().then(() => __importStar(require("./index")));
     await startBlueBubblesApp();
+    void refreshRuntimeCredentialConfig(agentName, { preserveCachedOnFailure: true }).catch(() => undefined);
 })
     .catch((error) => {
     (0, runtime_1.emitNervesEvent)({

package/dist/senses/bluebubbles/index.js

@@ -668,12 +668,11 @@ function isAgentSelfHandle(senderExternalId, ownHandles) {
     return false;
 }
 /**
- * In-memory store of agent iMessage handles auto-discovered from
- * `event.fromMe === true` events. Bluebubbles attributes the agent's
- * canonical handle as `event.sender.externalId` on outbound messages —
- * capturing it here makes the next `isFromMe`-missing group echo
- * (the bug that motivated `bluebubbles.ownHandles` originally) recoverable
- * even before the operator has populated the config.
+ * In-memory store of agent iMessage handles auto-discovered from group-chat
+ * `event.fromMe === true` events. Bluebubbles can attribute the peer's handle
+ * as `event.sender.externalId` on 1:1 outbound messages, so discovery is
+ * intentionally limited to the group echo bug that motivated
+ * `bluebubbles.ownHandles` originally.
  *
  * Per-process. A daemon restart re-learns from the next outbound. The
  * accompanying nerves event (`senses.bluebubbles_own_handle_discovered`)
@@ -709,6 +708,40 @@ function recordDiscoveredOwnHandle(senderExternalId) {
     });
     return true;
 }
+function isSelfFriendRecord(friend, agentName) {
+    if (!friend || friend.kind !== "agent")
+        return false;
+    const normalizedAgent = agentName.trim().toLowerCase();
+    const name = friend.name?.trim().toLowerCase();
+    const bundleName = friend.agentMeta?.bundleName?.trim().toLowerCase();
+    return name === normalizedAgent || bundleName === normalizedAgent;
+}
+async function shouldFilterAgentSelfHandle(event, resolvedDeps) {
+    if (!event.chat.isGroup)
+        return false;
+    if (!isAgentSelfHandle(event.sender.externalId, resolvedDeps.getOwnHandles()))
+        return false;
+    const store = resolvedDeps.createFriendStore();
+    const knownFriend = await store
+        .findByExternalId("imessage-handle", event.sender.externalId)
+        .catch(() => null);
+    if (knownFriend && !isSelfFriendRecord(knownFriend, resolvedDeps.getAgentName())) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "senses",
+            event: "senses.bluebubbles_self_handle_bypassed_known_friend",
+            message: "did not filter bluebubbles sender even though it matched ownHandles because it resolves to a known non-self friend",
+            meta: {
+                messageGuid: event.messageGuid,
+                kind: event.kind,
+                senderExternalId: event.sender.externalId,
+                friendId: knownFriend.id,
+            },
+        });
+        return false;
+    }
+    return true;
+}
 async function handleBlueBubblesNormalizedEvent(event, resolvedDeps, source) {
     const client = resolvedDeps.createClient();
     const agentName = resolvedDeps.getAgentName();
@@ -722,15 +755,18 @@ async function handleBlueBubblesNormalizedEvent(event, resolvedDeps, source) {
                 kind: event.kind,
             },
         });
-        recordDiscoveredOwnHandle(event.sender.externalId);
+        if (event.chat.isGroup)
+            recordDiscoveredOwnHandle(event.sender.externalId);
         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())) {
+    // the agent's known iMessage handles. Keep this group-only: 1:1 outbound
+    // echoes can be attributed to the peer handle, and stale ownHandles entries
+    // must not make real DMs disappear.
+    if (await shouldFilterAgentSelfHandle(event, resolvedDeps)) {
         (0, runtime_1.emitNervesEvent)({
             level: "warn",
             component: "senses",

package/dist/senses/cli-entry.js

@@ -49,7 +49,7 @@ if (!agentName) {
     meta: { entry: "cli", agentName },
 });
 Promise.resolve().then(() => __importStar(require("../heart/runtime-credentials"))).then(async ({ refreshRuntimeCredentialConfig }) => {
-    await refreshRuntimeCredentialConfig(agentName, { preserveCachedOnFailure: true }).catch(() => undefined);
+    void refreshRuntimeCredentialConfig(agentName, { preserveCachedOnFailure: true }).catch(() => undefined);
     const { main } = await Promise.resolve().then(() => __importStar(require("./cli")));
     main();
 })

package/dist/senses/teams-entry.js

@@ -49,7 +49,7 @@ if (!agentName) {
     meta: { entry: "teams", agentName },
 });
 Promise.resolve().then(() => __importStar(require("../heart/runtime-credentials"))).then(async ({ refreshRuntimeCredentialConfig }) => {
-    await refreshRuntimeCredentialConfig(agentName, { preserveCachedOnFailure: true }).catch(() => undefined);
+    void refreshRuntimeCredentialConfig(agentName, { preserveCachedOnFailure: true }).catch(() => undefined);
     const { startTeamsApp } = await Promise.resolve().then(() => __importStar(require("./teams")));
     startTeamsApp();
 })

package/package.json

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