@ouro.bot/cli 0.1.0-alpha.51 → 0.1.0-alpha.53

package/dist/senses/teams.js

@@ -40,6 +40,7 @@ exports.createTeamsCallbacks = createTeamsCallbacks;
 exports.resolvePendingConfirmation = resolvePendingConfirmation;
 exports.withConversationLock = withConversationLock;
 exports.handleTeamsMessage = handleTeamsMessage;
+exports.sendProactiveTeamsMessageToSession = sendProactiveTeamsMessageToSession;
 exports.drainAndSendPendingTeams = drainAndSendPendingTeams;
 exports.startTeamsApp = startTeamsApp;
 const fs = __importStar(require("fs"));
@@ -867,6 +868,98 @@ function findAadObjectId(friend) {
     }
     return undefined;
 }
+function resolveTeamsFriendStore(deps) {
+    return deps.store
+        ?? deps.createFriendStore?.()
+        ?? new store_file_1.FileFriendStore(path.join((0, identity_1.getAgentRoot)(), "friends"));
+}
+function getTeamsConversations(botApi) {
+    return botApi.conversations;
+}
+function hasExplicitCrossChatAuthorization(params) {
+    return params.intent === "explicit_cross_chat"
+        && types_1.TRUSTED_LEVELS.has(params.authorizingSession?.trustLevel ?? "stranger");
+}
+async function sendProactiveTeamsMessageToSession(params, deps) {
+    const store = resolveTeamsFriendStore(deps);
+    const conversations = getTeamsConversations(deps.botApi);
+    let friend;
+    try {
+        friend = await store.get(params.friendId);
+    }
+    catch {
+        friend = null;
+    }
+    if (!friend) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "senses",
+            event: "senses.teams_proactive_no_friend",
+            message: "proactive send skipped: friend not found",
+            meta: { friendId: params.friendId, sessionKey: params.sessionKey },
+        });
+        return { delivered: false, reason: "friend_not_found" };
+    }
+    if (!hasExplicitCrossChatAuthorization(params) && !types_1.TRUSTED_LEVELS.has(friend.trustLevel ?? "stranger")) {
+        (0, runtime_1.emitNervesEvent)({
+            component: "senses",
+            event: "senses.teams_proactive_trust_skip",
+            message: "proactive send skipped: trust level not allowed",
+            meta: {
+                friendId: params.friendId,
+                trustLevel: friend.trustLevel ?? "unknown",
+                intent: params.intent ?? "generic_outreach",
+                authorizingTrustLevel: params.authorizingSession?.trustLevel ?? null,
+            },
+        });
+        return { delivered: false, reason: "trust_skip" };
+    }
+    const aadInfo = findAadObjectId(friend);
+    if (!aadInfo) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "senses",
+            event: "senses.teams_proactive_no_aad_id",
+            message: "proactive send skipped: no AAD object ID found",
+            meta: { friendId: params.friendId, sessionKey: params.sessionKey },
+        });
+        return { delivered: false, reason: "missing_target" };
+    }
+    try {
+        const conversation = await conversations.create({
+            bot: { id: deps.botApi.id },
+            members: [{ id: aadInfo.aadObjectId, role: "user", name: friend.name || aadInfo.aadObjectId }],
+            tenantId: aadInfo.tenantId,
+            isGroup: false,
+        });
+        await conversations.activities(conversation.id).create({
+            type: "message",
+            text: params.text,
+        });
+        (0, runtime_1.emitNervesEvent)({
+            component: "senses",
+            event: "senses.teams_proactive_sent",
+            message: "proactive teams message sent",
+            meta: { friendId: params.friendId, aadObjectId: aadInfo.aadObjectId, sessionKey: params.sessionKey },
+        });
+        return { delivered: true };
+    }
+    catch (error) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "error",
+            component: "senses",
+            event: "senses.teams_proactive_send_error",
+            message: "proactive teams send failed",
+            meta: {
+                friendId: params.friendId,
+                aadObjectId: aadInfo.aadObjectId,
+                sessionKey: params.sessionKey,
+                reason: error instanceof Error ? error.message : String(error),
+            },
+        });
+        return { delivered: false, reason: "send_error" };
+    }
+}
 function scanPendingTeamsFiles(pendingRoot) {
     const results = [];
     let friendIds;
@@ -912,8 +1005,7 @@ async function drainAndSendPendingTeams(store, botApi, pendingRoot) {
     const root = pendingRoot ?? path.join((0, identity_1.getAgentRoot)(), "state", "pending");
     const pendingFiles = scanPendingTeamsFiles(root);
     const result = { sent: 0, skipped: 0, failed: 0 };
-    const conversations = botApi.conversations;
-    for (const { friendId, filePath, content } of pendingFiles) {
+    for (const { friendId, key, filePath, content } of pendingFiles) {
         let parsed;
         try {
             parsed = JSON.parse(content);
@@ -935,95 +1027,32 @@ async function drainAndSendPendingTeams(store, botApi, pendingRoot) {
             catch { /* ignore */ }
             continue;
         }
-        let friend;
-        try {
-            friend = await store.get(friendId);
-        }
-        catch {
-            friend = null;
-        }
-        if (!friend) {
-            result.skipped++;
-            try {
-                fs.unlinkSync(filePath);
-            }
-            catch { /* ignore */ }
-            (0, runtime_1.emitNervesEvent)({
-                level: "warn",
-                component: "senses",
-                event: "senses.teams_proactive_no_friend",
-                message: "proactive send skipped: friend not found",
-                meta: { friendId },
-            });
-            continue;
-        }
-        if (!types_1.TRUSTED_LEVELS.has(friend.trustLevel ?? "stranger")) {
-            result.skipped++;
+        const sendResult = await sendProactiveTeamsMessageToSession({
+            friendId,
+            sessionKey: key,
+            text: messageText,
+            intent: "generic_outreach",
+        }, {
+            botApi,
+            store,
+        });
+        if (sendResult.delivered) {
+            result.sent++;
             try {
                 fs.unlinkSync(filePath);
             }
             catch { /* ignore */ }
-            (0, runtime_1.emitNervesEvent)({
-                component: "senses",
-                event: "senses.teams_proactive_trust_skip",
-                message: "proactive send skipped: trust level not allowed",
-                meta: { friendId, trustLevel: friend.trustLevel ?? "unknown" },
-            });
             continue;
         }
-        const aadInfo = findAadObjectId(friend);
-        if (!aadInfo) {
+        if (sendResult.reason === "friend_not_found" || sendResult.reason === "trust_skip" || sendResult.reason === "missing_target") {
             result.skipped++;
             try {
                 fs.unlinkSync(filePath);
             }
             catch { /* ignore */ }
-            (0, runtime_1.emitNervesEvent)({
-                level: "warn",
-                component: "senses",
-                event: "senses.teams_proactive_no_aad_id",
-                message: "proactive send skipped: no AAD object ID found",
-                meta: { friendId },
-            });
             continue;
         }
-        try {
-            const conversation = await conversations.create({
-                bot: { id: botApi.id },
-                members: [{ id: aadInfo.aadObjectId, role: "user", name: friend.name || aadInfo.aadObjectId }],
-                tenantId: aadInfo.tenantId,
-                isGroup: false,
-            });
-            await conversations.activities(conversation.id).create({
-                type: "message",
-                text: messageText,
-            });
-            result.sent++;
-            try {
-                fs.unlinkSync(filePath);
-            }
-            catch { /* ignore */ }
-            (0, runtime_1.emitNervesEvent)({
-                component: "senses",
-                event: "senses.teams_proactive_sent",
-                message: "proactive teams message sent",
-                meta: { friendId, aadObjectId: aadInfo.aadObjectId },
-            });
-        }
-        catch (error) {
-            result.failed++;
-            (0, runtime_1.emitNervesEvent)({
-                level: "error",
-                component: "senses",
-                event: "senses.teams_proactive_send_error",
-                message: "proactive teams send failed",
-                meta: {
-                    friendId,
-                    aadObjectId: aadInfo.aadObjectId,
-                    reason: error instanceof Error ? error.message : String(error),
-                },
-            });
-        }
+        result.failed++;
     }
     if (result.sent > 0 || result.skipped > 0 || result.failed > 0) {
         (0, runtime_1.emitNervesEvent)({

package/package.json

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