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

package/changelog.json

@@ -1,6 +1,14 @@
 {
   "_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.52",
+      "changes": [
+        "Trusted 1:1 chats can now act live across active group threads: the harness resolves candidate target chats, carries explicit trust context into the model, and delivers messages into the right live BlueBubbles or Teams session instead of only queueing for later.",
+        "People discovered through a relevant live group are now bootstrapped as acquaintances with shared-group context, so the agent gets a socially truthful model of who is merely unknown versus who is known through the current group.",
+        "Cross-chat work now returns a truthful outcome back to the asking chat, and bridge suggestions can span different outward relationships when one live piece of work is clearly happening across them."
+      ]
+    },
     {
       "version": "0.1.0-alpha.51",
       "changes": [

package/dist/heart/active-work.js

@@ -5,6 +5,7 @@ exports.buildActiveWorkFrame = buildActiveWorkFrame;
 exports.formatActiveWorkFrame = formatActiveWorkFrame;
 const runtime_1 = require("../nerves/runtime");
 const state_machine_1 = require("./bridges/state-machine");
+const target_resolution_1 = require("./target-resolution");
 function activityPriority(source) {
     return source === "friend-facing" ? 0 : 1;
 }
@@ -31,16 +32,28 @@ function hasSharedObligationPressure(input) {
         || summarizeLiveTasks(input.taskBoard).length > 0;
 }
 function suggestBridgeForActiveWork(input) {
-    const candidateSessions = input.friendSessions
-        .filter((session) => !input.currentSession
-        || session.friendId !== input.currentSession.friendId
-        || session.channel !== input.currentSession.channel
-        || session.key !== input.currentSession.key)
-        .sort(compareActivity);
-    const targetSession = candidateSessions[0] ?? null;
-    if (!targetSession || !hasSharedObligationPressure(input)) {
+    const targetCandidates = (input.targetCandidates ?? [])
+        .filter((candidate) => {
+        if (candidate.delivery.mode === "blocked") {
+            return false;
+        }
+        if (candidate.activitySource !== "friend-facing" || candidate.channel === "inner") {
+            return false;
+        }
+        if (!input.currentSession) {
+            return true;
+        }
+        return !(candidate.friendId === input.currentSession.friendId
+            && candidate.channel === input.currentSession.channel
+            && candidate.key === input.currentSession.key);
+    })
+        .sort((a, b) => {
+        return b.lastActivityMs - a.lastActivityMs;
+    });
+    if (!hasSharedObligationPressure(input) || targetCandidates.length !== 1) {
         return null;
     }
+    const targetSession = targetCandidates[0];
     const activeBridge = input.bridges.find(isActiveBridge) ?? null;
     if (activeBridge) {
         const alreadyAttached = activeBridge.attachedSessions.some((session) => session.friendId === targetSession.friendId
@@ -53,14 +66,14 @@ function suggestBridgeForActiveWork(input) {
             kind: "attach-existing",
             bridgeId: activeBridge.id,
             targetSession,
-            reason: "same-friend-shared-work",
+            reason: "shared-work-candidate",
         };
     }
     return {
         kind: "begin-new",
         targetSession,
         objectiveHint: input.currentObligation?.trim() || "keep this shared work aligned",
-        reason: "same-friend-shared-work",
+        reason: "shared-work-candidate",
     };
 }
 function formatSessionLabel(session) {
@@ -95,13 +108,14 @@ function buildActiveWorkFrame(input) {
             freshestForCurrentFriend: friendSessions[0] ?? null,
             otherLiveSessionsForCurrentFriend: friendSessions,
         },
+        targetCandidates: input.targetCandidates ?? [],
         bridgeSuggestion: suggestBridgeForActiveWork({
             currentSession: input.currentSession,
             currentObligation: input.currentObligation,
             mustResolveBeforeHandoff: input.mustResolveBeforeHandoff,
             bridges: input.bridges,
             taskBoard: input.taskBoard,
-            friendSessions,
+            targetCandidates: input.targetCandidates,
         }),
     };
     (0, runtime_1.emitNervesEvent)({
@@ -144,6 +158,13 @@ function formatActiveWorkFrame(frame) {
     if (frame.friendActivity?.freshestForCurrentFriend) {
         lines.push(`freshest friend-facing session: ${formatSessionLabel(frame.friendActivity.freshestForCurrentFriend)}`);
     }
+    const targetCandidatesBlock = frame.targetCandidates && frame.targetCandidates.length > 0
+        ? (0, target_resolution_1.formatTargetSessionCandidates)(frame.targetCandidates)
+        : "";
+    if (targetCandidatesBlock) {
+        lines.push("");
+        lines.push(targetCandidatesBlock);
+    }
     if (frame.bridgeSuggestion) {
         if (frame.bridgeSuggestion.kind === "attach-existing") {
             lines.push(`suggested bridge: attach ${frame.bridgeSuggestion.bridgeId} -> ${formatSessionLabel(frame.bridgeSuggestion.targetSession)}`);

package/dist/heart/cross-chat-delivery.js

@@ -0,0 +1,146 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deliverCrossChatMessage = deliverCrossChatMessage;
+const types_1 = require("../mind/friends/types");
+const runtime_1 = require("../nerves/runtime");
+function buildPendingEnvelope(request, agentName, now) {
+    return {
+        from: agentName,
+        friendId: request.friendId,
+        channel: request.channel,
+        key: request.key,
+        content: request.content,
+        timestamp: now,
+    };
+}
+function queueForLater(request, deps, detail) {
+    deps.queuePending(buildPendingEnvelope(request, deps.agentName, (deps.now ?? Date.now)()));
+    return {
+        status: "queued_for_later",
+        detail,
+    };
+}
+function isExplicitlyAuthorized(request) {
+    return request.intent === "explicit_cross_chat"
+        && Boolean(request.authorizingSession)
+        && (0, types_1.isTrustedLevel)(request.authorizingSession?.trustLevel);
+}
+async function deliverCrossChatMessage(request, deps) {
+    (0, runtime_1.emitNervesEvent)({
+        component: "engine",
+        event: "engine.cross_chat_delivery_start",
+        message: "resolving cross-chat delivery",
+        meta: {
+            friendId: request.friendId,
+            channel: request.channel,
+            key: request.key,
+            intent: request.intent,
+            authorizingTrustLevel: request.authorizingSession?.trustLevel ?? null,
+        },
+    });
+    if (request.intent === "generic_outreach") {
+        const result = queueForLater(request, deps, "generic outreach stays queued until the target session is next active");
+        (0, runtime_1.emitNervesEvent)({
+            component: "engine",
+            event: "engine.cross_chat_delivery_end",
+            message: "queued generic outreach for later delivery",
+            meta: {
+                friendId: request.friendId,
+                channel: request.channel,
+                key: request.key,
+                status: result.status,
+            },
+        });
+        return result;
+    }
+    if (!isExplicitlyAuthorized(request)) {
+        const result = {
+            status: "blocked",
+            detail: "explicit cross-chat delivery requires a trusted asking session",
+        };
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "engine",
+            event: "engine.cross_chat_delivery_end",
+            message: "blocked explicit cross-chat delivery",
+            meta: {
+                friendId: request.friendId,
+                channel: request.channel,
+                key: request.key,
+                status: result.status,
+            },
+        });
+        return result;
+    }
+    const deliverer = deps.deliverers?.[request.channel];
+    if (!deliverer) {
+        const result = queueForLater(request, deps, "live delivery unavailable right now; queued for the next active turn");
+        (0, runtime_1.emitNervesEvent)({
+            component: "engine",
+            event: "engine.cross_chat_delivery_end",
+            message: "queued explicit cross-chat delivery because no live deliverer was available",
+            meta: {
+                friendId: request.friendId,
+                channel: request.channel,
+                key: request.key,
+                status: result.status,
+            },
+        });
+        return result;
+    }
+    try {
+        const direct = await deliverer(request);
+        if (direct.status === "delivered_now" || direct.status === "blocked" || direct.status === "failed") {
+            const result = {
+                status: direct.status,
+                detail: direct.detail,
+            };
+            (0, runtime_1.emitNervesEvent)({
+                level: result.status === "failed" ? "error" : result.status === "blocked" ? "warn" : "info",
+                component: "engine",
+                event: "engine.cross_chat_delivery_end",
+                message: "completed direct cross-chat delivery resolution",
+                meta: {
+                    friendId: request.friendId,
+                    channel: request.channel,
+                    key: request.key,
+                    status: result.status,
+                },
+            });
+            return result;
+        }
+        const result = queueForLater(request, deps, direct.detail.trim() || "live delivery unavailable right now; queued for the next active turn");
+        (0, runtime_1.emitNervesEvent)({
+            component: "engine",
+            event: "engine.cross_chat_delivery_end",
+            message: "queued explicit cross-chat delivery after adapter reported unavailability",
+            meta: {
+                friendId: request.friendId,
+                channel: request.channel,
+                key: request.key,
+                status: result.status,
+            },
+        });
+        return result;
+    }
+    catch (error) {
+        const result = {
+            status: "failed",
+            detail: error instanceof Error ? error.message : String(error),
+        };
+        (0, runtime_1.emitNervesEvent)({
+            level: "error",
+            component: "engine",
+            event: "engine.cross_chat_delivery_end",
+            message: "cross-chat delivery threw unexpectedly",
+            meta: {
+                friendId: request.friendId,
+                channel: request.channel,
+                key: request.key,
+                status: result.status,
+                reason: result.detail,
+            },
+        });
+        return result;
+    }
+}

package/dist/heart/target-resolution.js

@@ -0,0 +1,123 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listTargetSessionCandidates = listTargetSessionCandidates;
+exports.formatTargetSessionCandidates = formatTargetSessionCandidates;
+const session_recall_1 = require("./session-recall");
+const session_activity_1 = require("./session-activity");
+const trust_explanation_1 = require("../mind/friends/trust-explanation");
+const runtime_1 = require("../nerves/runtime");
+function synthesizeFriendRecord(candidate) {
+    return {
+        id: candidate.friendId,
+        name: candidate.friendName,
+        role: "stranger",
+        trustLevel: "stranger",
+        connections: [],
+        externalIds: [],
+        tenantMemberships: [],
+        toolPreferences: {},
+        notes: {},
+        totalTokens: 0,
+        createdAt: new Date(0).toISOString(),
+        updatedAt: new Date(0).toISOString(),
+        schemaVersion: 1,
+    };
+}
+function deliveryPriority(mode) {
+    if (mode === "deliver_now")
+        return 0;
+    if (mode === "queue_only")
+        return 1;
+    return 2;
+}
+function activityPriority(source) {
+    return source === "friend-facing" ? 0 : 1;
+}
+function describeDelivery(candidate) {
+    if (candidate.channel !== "bluebubbles" && candidate.channel !== "teams") {
+        return { mode: "blocked", reason: "this channel does not support proactive outward delivery yet" };
+    }
+    if (candidate.trust.level === "family" || candidate.trust.level === "friend") {
+        return { mode: "deliver_now", reason: "directly trusted target on a proactive-delivery channel" };
+    }
+    return { mode: "queue_only", reason: "visible as a live chat, but immediate delivery still needs explicit cross-chat authorization" };
+}
+async function listTargetSessionCandidates(input) {
+    (0, runtime_1.emitNervesEvent)({
+        component: "engine",
+        event: "engine.target_resolution_start",
+        message: "listing live target session candidates",
+        meta: {
+            sessionsDir: input.sessionsDir,
+            currentSession: input.currentSession
+                ? `${input.currentSession.friendId}/${input.currentSession.channel}/${input.currentSession.key}`
+                : null,
+        },
+    });
+    const activity = (0, session_activity_1.listSessionActivity)({
+        sessionsDir: input.sessionsDir,
+        friendsDir: input.friendsDir,
+        agentName: input.agentName,
+        currentSession: input.currentSession ?? null,
+    }).filter((entry) => entry.channel !== "inner");
+    const candidates = [];
+    for (const entry of activity) {
+        const friend = await input.friendStore.get(entry.friendId) ?? synthesizeFriendRecord(entry);
+        const trust = (0, trust_explanation_1.describeTrustContext)({
+            friend,
+            channel: entry.channel,
+        });
+        const recall = await (0, session_recall_1.recallSession)({
+            sessionPath: entry.sessionPath,
+            friendId: entry.friendId,
+            channel: entry.channel,
+            key: entry.key,
+            messageCount: 6,
+            summarize: input.summarize,
+            trustLevel: trust.level,
+        });
+        const snapshot = recall.kind === "ok"
+            ? recall.snapshot
+            : recall.kind === "empty"
+                ? "recent focus: no recent visible messages"
+                : "recent focus: session transcript unavailable";
+        const delivery = describeDelivery({
+            channel: entry.channel,
+            trust,
+        });
+        candidates.push({
+            friendId: entry.friendId,
+            friendName: entry.friendName,
+            channel: entry.channel,
+            key: entry.key,
+            sessionPath: entry.sessionPath,
+            snapshot,
+            trust,
+            delivery,
+            lastActivityAt: entry.lastActivityAt,
+            lastActivityMs: entry.lastActivityMs,
+            activitySource: entry.activitySource,
+        });
+    }
+    return candidates.sort((a, b) => {
+        const deliveryDiff = deliveryPriority(a.delivery.mode) - deliveryPriority(b.delivery.mode);
+        if (deliveryDiff !== 0)
+            return deliveryDiff;
+        const sourceDiff = activityPriority(a.activitySource) - activityPriority(b.activitySource);
+        if (sourceDiff !== 0)
+            return sourceDiff;
+        return b.lastActivityMs - a.lastActivityMs;
+    });
+}
+function formatTargetSessionCandidates(candidates) {
+    if (candidates.length === 0)
+        return "";
+    const lines = ["## candidate target chats"];
+    for (const candidate of candidates) {
+        lines.push(`- ${candidate.friendName} [${candidate.friendId}] via ${candidate.channel}/${candidate.key}`);
+        lines.push(`  trust: ${candidate.trust.level} (${candidate.trust.basis}) — ${candidate.trust.summary}`);
+        lines.push(`  delivery: ${candidate.delivery.mode} — ${candidate.delivery.reason}`);
+        lines.push(`  snapshot: ${candidate.snapshot}`);
+    }
+    return lines.join("\n");
+}

package/dist/mind/friends/group-context.js

@@ -0,0 +1,144 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.upsertGroupContextParticipants = upsertGroupContextParticipants;
+const node_crypto_1 = require("node:crypto");
+const runtime_1 = require("../../nerves/runtime");
+const CURRENT_SCHEMA_VERSION = 1;
+function normalizeDisplayName(externalId, displayName) {
+    const trimmed = displayName?.trim();
+    return trimmed && trimmed.length > 0 ? trimmed : externalId;
+}
+function buildNameNotes(name, now) {
+    return name !== "Unknown"
+        ? { name: { value: name, savedAt: now } }
+        : {};
+}
+function dedupeParticipants(participants) {
+    const deduped = new Map();
+    for (const participant of participants) {
+        const externalId = participant.externalId.trim();
+        if (!externalId)
+            continue;
+        const key = `${participant.provider}:${externalId}`;
+        if (!deduped.has(key)) {
+            deduped.set(key, {
+                ...participant,
+                externalId,
+                displayName: participant.displayName?.trim() || undefined,
+            });
+        }
+    }
+    return Array.from(deduped.values());
+}
+function createGroupExternalId(provider, groupExternalId, linkedAt) {
+    return {
+        provider,
+        externalId: groupExternalId,
+        linkedAt,
+    };
+}
+function shouldPromoteToAcquaintance(friend) {
+    return (friend.trustLevel ?? "stranger") === "stranger";
+}
+function createAcquaintanceRecord(participant, groupExternalId, linkedAt) {
+    const name = normalizeDisplayName(participant.externalId, participant.displayName);
+    return {
+        id: (0, node_crypto_1.randomUUID)(),
+        name,
+        role: "acquaintance",
+        trustLevel: "acquaintance",
+        connections: [],
+        externalIds: [
+            {
+                provider: participant.provider,
+                externalId: participant.externalId,
+                linkedAt,
+            },
+            createGroupExternalId(participant.provider, groupExternalId, linkedAt),
+        ],
+        tenantMemberships: [],
+        toolPreferences: {},
+        notes: buildNameNotes(name, linkedAt),
+        totalTokens: 0,
+        createdAt: linkedAt,
+        updatedAt: linkedAt,
+        schemaVersion: CURRENT_SCHEMA_VERSION,
+    };
+}
+async function upsertGroupContextParticipants(input) {
+    (0, runtime_1.emitNervesEvent)({
+        component: "friends",
+        event: "friends.group_context_upsert_start",
+        message: "upserting shared-group participant context",
+        meta: {
+            participantCount: input.participants.length,
+            hasGroupExternalId: input.groupExternalId.trim().length > 0,
+        },
+    });
+    const groupExternalId = input.groupExternalId.trim();
+    if (!groupExternalId) {
+        return [];
+    }
+    const now = input.now ?? (() => new Date().toISOString());
+    const participants = dedupeParticipants(input.participants);
+    const results = [];
+    for (const participant of participants) {
+        const linkedAt = now();
+        const existing = await input.store.findByExternalId(participant.provider, participant.externalId);
+        if (!existing) {
+            const created = createAcquaintanceRecord(participant, groupExternalId, linkedAt);
+            await input.store.put(created.id, created);
+            results.push({
+                friendId: created.id,
+                name: created.name,
+                trustLevel: "acquaintance",
+                created: true,
+                updated: false,
+                addedGroupExternalId: true,
+            });
+            continue;
+        }
+        const hasGroupExternalId = existing.externalIds.some((externalId) => externalId.externalId === groupExternalId);
+        const promoteToAcquaintance = shouldPromoteToAcquaintance(existing);
+        const trustLevel = promoteToAcquaintance
+            ? "acquaintance"
+            : existing.trustLevel;
+        const role = promoteToAcquaintance
+            ? "acquaintance"
+            : existing.role;
+        const updatedExternalIds = hasGroupExternalId
+            ? existing.externalIds
+            : [...existing.externalIds, createGroupExternalId(participant.provider, groupExternalId, linkedAt)];
+        const updated = promoteToAcquaintance || !hasGroupExternalId;
+        const record = updated
+            ? {
+                ...existing,
+                role,
+                trustLevel,
+                externalIds: updatedExternalIds,
+                updatedAt: linkedAt,
+            }
+            : existing;
+        if (updated) {
+            await input.store.put(record.id, record);
+        }
+        results.push({
+            friendId: record.id,
+            name: record.name,
+            trustLevel,
+            created: false,
+            updated,
+            addedGroupExternalId: !hasGroupExternalId,
+        });
+    }
+    (0, runtime_1.emitNervesEvent)({
+        component: "friends",
+        event: "friends.group_context_upsert_end",
+        message: "upserted shared-group participant context",
+        meta: {
+            participantCount: participants.length,
+            updatedCount: results.filter((result) => result.created || result.updated).length,
+        },
+    });
+    return results;
+}

package/dist/mind/friends/trust-explanation.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.describeTrustContext = describeTrustContext;
+const runtime_1 = require("../../nerves/runtime");
+function findRelatedGroupId(friend) {
+    return friend.externalIds.find((externalId) => externalId.externalId.startsWith("group:"))?.externalId;
+}
+function resolveLevel(friend) {
+    return friend.trustLevel ?? "stranger";
+}
+function describeTrustContext(input) {
+    const level = resolveLevel(input.friend);
+    const relatedGroupId = findRelatedGroupId(input.friend);
+    const explanation = level === "family" || level === "friend"
+        ? {
+            level,
+            basis: "direct",
+            summary: level === "family"
+                ? "direct family trust"
+                : "direct trusted relationship",
+            why: "this relationship is directly trusted rather than inferred through a shared group or cold first contact.",
+            permits: [
+                "local operations when appropriate",
+                "proactive follow-through",
+                "full collaborative problem solving",
+            ],
+            constraints: [],
+        }
+        : level === "acquaintance"
+            ? {
+                level,
+                basis: "shared_group",
+                summary: relatedGroupId
+                    ? "known through the shared project group"
+                    : "known through a shared group context",
+                why: relatedGroupId
+                    ? `this trust comes from the shared group context ${relatedGroupId}, not from direct endorsement.`
+                    : "this trust comes from shared group context rather than direct endorsement.",
+                permits: [
+                    "group-safe coordination",
+                    "normal conversation inside the shared context",
+                ],
+                constraints: [
+                    "guarded local actions",
+                    "do not assume broad private authority",
+                ],
+                relatedGroupId,
+            }
+            : {
+                level,
+                basis: "unknown",
+                summary: "truly unknown first-contact context",
+                why: "this person is not known through direct trust or a shared group context.",
+                permits: [
+                    "safe first-contact orientation only",
+                ],
+                constraints: [
+                    "first contact does not reach the full model on open channels",
+                    "no local or privileged actions",
+                ],
+            };
+    (0, runtime_1.emitNervesEvent)({
+        component: "friends",
+        event: "friends.trust_explained",
+        message: "built explicit trust explanation",
+        meta: {
+            channel: input.channel,
+            level: explanation.level,
+            basis: explanation.basis,
+            hasRelatedGroup: Boolean(explanation.relatedGroupId),
+        },
+    });
+    return explanation;
+}

package/dist/mind/prompt.js

@@ -51,6 +51,7 @@ const tools_1 = require("../repertoire/tools");
 const skills_1 = require("../repertoire/skills");
 const identity_1 = require("../heart/identity");
 const types_1 = require("./friends/types");
+const trust_explanation_1 = require("./friends/trust-explanation");
 const channel_1 = require("./friends/channel");
 const runtime_1 = require("../nerves/runtime");
 const bundle_manifest_1 = require("./bundle-manifest");
@@ -329,6 +330,31 @@ some of my tools are unavailable right now: ${toolList}
 
 i don't know this person well enough yet to run local operations on their behalf. i can suggest remote-safe alternatives or ask them to run it from CLI.`;
 }
+function trustContextSection(context) {
+    if (!context?.friend)
+        return "";
+    const channelName = context.channel.channel;
+    if (channelName === "cli" || channelName === "inner")
+        return "";
+    const explanation = (0, trust_explanation_1.describeTrustContext)({
+        friend: context.friend,
+        channel: channelName,
+        isGroupChat: context.isGroupChat,
+    });
+    const lines = [
+        "## trust context",
+        `level: ${explanation.level}`,
+        `basis: ${explanation.basis}`,
+        `summary: ${explanation.summary}`,
+        `why: ${explanation.why}`,
+        `permits: ${explanation.permits.join(", ")}`,
+        `constraints: ${explanation.constraints.join(", ") || "none"}`,
+    ];
+    if (explanation.relatedGroupId) {
+        lines.push(`related group: ${explanation.relatedGroupId}`);
+    }
+    return lines.join("\n");
+}
 function skillsSection() {
     const names = (0, skills_1.listSkills)() || [];
     if (!names.length)
@@ -520,6 +546,7 @@ async function buildSystem(channel = "cli", options, context) {
         toolsSection(channel, options, context),
         reasoningEffortSection(options),
         toolRestrictionSection(context),
+        trustContextSection(context),
         mixedTrustGroupSection(context),
         skillsSection(),
         taskBoardSection(),

package/dist/repertoire/tools-base.js

@@ -50,6 +50,7 @@ const tools_1 = require("./coding/tools");
 const memory_1 = require("../mind/memory");
 const pending_1 = require("../mind/pending");
 const progress_story_1 = require("../heart/progress-story");
+const cross_chat_delivery_1 = require("../heart/cross-chat-delivery");
 // Tracks which file paths have been read via read_file in this session.
 // edit_file requires a file to be read first (must-read-first guard).
 exports.editFileReadTracker = new Set();
@@ -115,6 +116,34 @@ function normalizeProgressOutcome(text) {
     }
     return trimmed;
 }
+function writePendingEnvelope(queueDir, message) {
+    fs.mkdirSync(queueDir, { recursive: true });
+    const fileName = `${message.timestamp}-${Math.random().toString(36).slice(2, 10)}.json`;
+    const filePath = path.join(queueDir, fileName);
+    fs.writeFileSync(filePath, JSON.stringify(message, null, 2));
+}
+function renderCrossChatDeliveryStatus(target, result) {
+    const phase = result.status === "delivered_now"
+        ? "completed"
+        : result.status === "queued_for_later"
+            ? "queued"
+            : result.status === "blocked"
+                ? "blocked"
+                : "errored";
+    const lead = result.status === "delivered_now"
+        ? "delivered now"
+        : result.status === "queued_for_later"
+            ? "queued for later"
+            : result.status === "blocked"
+                ? "blocked"
+                : "failed";
+    return (0, progress_story_1.renderProgressStory)((0, progress_story_1.buildProgressStory)({
+        scope: "shared-work",
+        phase,
+        objective: `message to ${target}`,
+        outcomeText: `${lead}\n${result.detail}`,
+    }));
+}
 function renderInnerProgressStatus(status) {
     if (status.processing === "pending") {
         return (0, progress_story_1.renderProgressStory)((0, progress_story_1.buildProgressStory)({
@@ -817,7 +846,7 @@ exports.baseToolDefinitions = [
             type: "function",
             function: {
                 name: "send_message",
-                description: "send a message to a friend's session. the message is queued as a pending file and delivered when the target session drains its queue.",
+                description: "send a message to a friend's session. when the request is explicitly authorized from a trusted live chat, the harness will try to deliver immediately; otherwise it reports truthful queued/block/failure state.",
                 parameters: {
                     type: "object",
                     properties: {
@@ -843,9 +872,6 @@ exports.baseToolDefinitions = [
             const pendingDir = isSelf
                 ? (0, pending_1.getInnerDialogPendingDir)(agentName)
                 : (0, pending_1.getPendingDir)(agentName, friendId, channel, key);
-            fs.mkdirSync(pendingDir, { recursive: true });
-            const fileName = `${now}-${Math.random().toString(36).slice(2, 10)}.json`;
-            const filePath = path.join(pendingDir, fileName);
             const delegatingBridgeId = findDelegatingBridgeId(ctx);
             const delegatedFrom = isSelf
                 && ctx?.currentSession
@@ -866,8 +892,8 @@ exports.baseToolDefinitions = [
                 timestamp: now,
                 ...(delegatedFrom ? { delegatedFrom } : {}),
             };
-            fs.writeFileSync(filePath, JSON.stringify(envelope, null, 2));
             if (isSelf) {
+                writePendingEnvelope(pendingDir, envelope);
                 let wakeResponse = null;
                 try {
                     wakeResponse = await (0, socket_client_1.requestInnerWake)(agentName);
@@ -906,9 +932,103 @@ exports.baseToolDefinitions = [
                     surfaced: "nothing yet",
                 });
             }
-            const preview = content.length > 80 ? content.slice(0, 80) + "…" : content;
-            const target = `${channel}/${key}`;
-            return `message queued for delivery to ${friendId} on ${target}. preview: "${preview}". it will be delivered when their session is next active.`;
+            const deliveryResult = await (0, cross_chat_delivery_1.deliverCrossChatMessage)({
+                friendId,
+                channel,
+                key,
+                content,
+                intent: ctx?.currentSession && ctx.currentSession.friendId !== "self"
+                    ? "explicit_cross_chat"
+                    : "generic_outreach",
+                ...(ctx?.currentSession && ctx.currentSession.friendId !== "self"
+                    ? {
+                        authorizingSession: {
+                            friendId: ctx.currentSession.friendId,
+                            channel: ctx.currentSession.channel,
+                            key: ctx.currentSession.key,
+                            trustLevel: ctx?.context?.friend?.trustLevel,
+                        },
+                    }
+                    : {}),
+            }, {
+                agentName,
+                queuePending: (message) => writePendingEnvelope(pendingDir, message),
+                deliverers: {
+                    bluebubbles: async (request) => {
+                        const { sendProactiveBlueBubblesMessageToSession } = await Promise.resolve().then(() => __importStar(require("../senses/bluebubbles")));
+                        const result = await sendProactiveBlueBubblesMessageToSession({
+                            friendId: request.friendId,
+                            sessionKey: request.key,
+                            text: request.content,
+                            intent: request.intent,
+                            authorizingSession: request.authorizingSession,
+                        });
+                        if (result.delivered) {
+                            return {
+                                status: "delivered_now",
+                                detail: "sent to the active bluebubbles chat now",
+                            };
+                        }
+                        if (result.reason === "missing_target") {
+                            return {
+                                status: "blocked",
+                                detail: "bluebubbles could not resolve a routable target for that session",
+                            };
+                        }
+                        if (result.reason === "send_error") {
+                            return {
+                                status: "failed",
+                                detail: "bluebubbles send failed",
+                            };
+                        }
+                        return {
+                            status: "unavailable",
+                            detail: "live delivery unavailable right now; queued for the next active turn",
+                        };
+                    },
+                    teams: async (request) => {
+                        if (!ctx?.botApi) {
+                            return {
+                                status: "unavailable",
+                                detail: "live delivery unavailable right now; queued for the next active turn",
+                            };
+                        }
+                        const { sendProactiveTeamsMessageToSession } = await Promise.resolve().then(() => __importStar(require("../senses/teams")));
+                        const result = await sendProactiveTeamsMessageToSession({
+                            friendId: request.friendId,
+                            sessionKey: request.key,
+                            text: request.content,
+                            intent: request.intent,
+                            authorizingSession: request.authorizingSession,
+                        }, {
+                            botApi: ctx.botApi,
+                        });
+                        if (result.delivered) {
+                            return {
+                                status: "delivered_now",
+                                detail: "sent to the active teams chat now",
+                            };
+                        }
+                        if (result.reason === "missing_target") {
+                            return {
+                                status: "blocked",
+                                detail: "teams could not resolve a routable target for that session",
+                            };
+                        }
+                        if (result.reason === "send_error") {
+                            return {
+                                status: "failed",
+                                detail: "teams send failed",
+                            };
+                        }
+                        return {
+                            status: "unavailable",
+                            detail: "live delivery unavailable right now; queued for the next active turn",
+                        };
+                    },
+                },
+            });
+            return renderCrossChatDeliveryStatus(`${friendId} on ${channel}/${key}`, deliveryResult);
         },
     },
     {

package/dist/senses/bluebubbles.js

@@ -48,6 +48,7 @@ const identity_1 = require("../heart/identity");
 const turn_coordinator_1 = require("../heart/turn-coordinator");
 const context_1 = require("../mind/context");
 const tokens_1 = require("../mind/friends/tokens");
+const group_context_1 = require("../mind/friends/group-context");
 const resolver_1 = require("../mind/friends/resolver");
 const store_file_1 = require("../mind/friends/store-file");
 const types_1 = require("../mind/friends/types");
@@ -97,6 +98,10 @@ function resolveFriendParams(event) {
         channel: "bluebubbles",
     };
 }
+function resolveGroupExternalId(event) {
+    const groupKey = event.chat.chatGuid ?? event.chat.chatIdentifier ?? event.sender.externalId;
+    return `group:${groupKey}`;
+}
 /**
  * Check if any participant in a group chat is a known family member.
  * Looks up each participant handle in the friend store.
@@ -585,6 +590,16 @@ async function handleBlueBubblesNormalizedEvent(event, resolvedDeps, source) {
                 return { handled: true, notifiedAgent: false, kind: event.kind, reason: "already_processed" };
             }
         }
+        if (event.kind === "message" && event.chat.isGroup) {
+            await (0, group_context_1.upsertGroupContextParticipants)({
+                store,
+                participants: (event.chat.participantHandles ?? []).map((externalId) => ({
+                    provider: "imessage-handle",
+                    externalId,
+                })),
+                groupExternalId: resolveGroupExternalId(event),
+            });
+        }
         // Build inbound user message (adapter concern: BB-specific content formatting)
         const userMessage = {
             role: "user",
@@ -842,21 +857,33 @@ function findImessageHandle(friend) {
     }
     return undefined;
 }
+function normalizeBlueBubblesSessionKey(sessionKey) {
+    const trimmed = sessionKey.trim();
+    if (trimmed.startsWith("chat_identifier_")) {
+        return `chat_identifier:${trimmed.slice("chat_identifier_".length)}`;
+    }
+    if (trimmed.startsWith("chat_")) {
+        return `chat:${trimmed.slice("chat_".length)}`;
+    }
+    return trimmed;
+}
 function extractChatIdentifierFromSessionKey(sessionKey) {
-    if (sessionKey.startsWith("chat:")) {
-        const chatGuid = sessionKey.slice("chat:".length).trim();
+    const normalizedKey = normalizeBlueBubblesSessionKey(sessionKey);
+    if (normalizedKey.startsWith("chat:")) {
+        const chatGuid = normalizedKey.slice("chat:".length).trim();
         const parts = chatGuid.split(";");
         return parts.length >= 3 ? parts[2]?.trim() || undefined : undefined;
     }
-    if (sessionKey.startsWith("chat_identifier:")) {
-        const identifier = sessionKey.slice("chat_identifier:".length).trim();
+    if (normalizedKey.startsWith("chat_identifier:")) {
+        const identifier = normalizedKey.slice("chat_identifier:".length).trim();
         return identifier || undefined;
     }
     return undefined;
 }
 function buildChatRefForSessionKey(friend, sessionKey) {
-    if (sessionKey.startsWith("chat:")) {
-        const chatGuid = sessionKey.slice("chat:".length).trim();
+    const normalizedKey = normalizeBlueBubblesSessionKey(sessionKey);
+    if (normalizedKey.startsWith("chat:")) {
+        const chatGuid = normalizedKey.slice("chat:".length).trim();
         if (!chatGuid)
             return null;
         return {
@@ -900,12 +927,20 @@ async function sendProactiveBlueBubblesMessageToSession(params, deps = {}) {
         });
         return { delivered: false, reason: "friend_not_found" };
     }
-    if (!types_1.TRUSTED_LEVELS.has(friend.trustLevel ?? "stranger")) {
+    const explicitCrossChatAuthorized = params.intent === "explicit_cross_chat"
+        && types_1.TRUSTED_LEVELS.has(params.authorizingSession?.trustLevel ?? "stranger");
+    if (!explicitCrossChatAuthorized && !types_1.TRUSTED_LEVELS.has(friend.trustLevel ?? "stranger")) {
         (0, runtime_1.emitNervesEvent)({
             component: "senses",
             event: "senses.bluebubbles_proactive_trust_skip",
             message: "proactive send skipped: trust level not allowed",
-            meta: { friendId: params.friendId, sessionKey: params.sessionKey, trustLevel: friend.trustLevel ?? "unknown" },
+            meta: {
+                friendId: params.friendId,
+                sessionKey: params.sessionKey,
+                trustLevel: friend.trustLevel ?? "unknown",
+                intent: params.intent ?? "generic_outreach",
+                authorizingTrustLevel: params.authorizingSession?.trustLevel ?? null,
+            },
         });
         return { delivered: false, reason: "trust_skip" };
     }

package/dist/senses/pipeline.js

@@ -14,6 +14,7 @@ const tasks_1 = require("../repertoire/tasks");
 const session_activity_1 = require("../heart/session-activity");
 const active_work_1 = require("../heart/active-work");
 const delegation_1 = require("../heart/delegation");
+const target_resolution_1 = require("../heart/target-resolution");
 const thoughts_1 = require("../heart/daemon/thoughts");
 const pending_1 = require("../mind/pending");
 function emptyTaskBoard() {
@@ -137,6 +138,26 @@ async function handleInboundTurn(input) {
     catch {
         sessionActivity = [];
     }
+    let targetCandidates = [];
+    try {
+        if (input.channel !== "inner") {
+            const agentRoot = (0, identity_1.getAgentRoot)();
+            targetCandidates = await (0, target_resolution_1.listTargetSessionCandidates)({
+                sessionsDir: `${agentRoot}/state/sessions`,
+                friendsDir: `${agentRoot}/friends`,
+                agentName: (0, identity_1.getAgentName)(),
+                currentSession: {
+                    friendId: currentSession.friendId,
+                    channel: currentSession.channel,
+                    key: currentSession.key,
+                },
+                friendStore: input.friendStore,
+            });
+        }
+    }
+    catch {
+        targetCandidates = [];
+    }
     const activeWorkFrame = (0, active_work_1.buildActiveWorkFrame)({
         currentSession,
         currentObligation,
@@ -152,6 +173,7 @@ async function handleInboundTurn(input) {
             }
         })(),
         friendActivity: sessionActivity,
+        targetCandidates,
     });
     const delegationDecision = (0, delegation_1.decideDelegation)({
         channel: input.channel,

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.52",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",