@ouro.bot/cli 0.1.0-alpha.350 → 0.1.0-alpha.351

package/changelog.json

@@ -1,6 +1,16 @@
 {
   "_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.351",
+      "changes": [
+        "Surface tool description rewritten from 'surface progress' to 'send a message to someone' — makes it clear the tool is for interpersonal messaging, not status reporting.",
+        "Inner dialog prompt contract now guides agents to use rest(note) for heartbeat state and ponder(reflection) for deeper thoughts, keeping surface strictly for words meant for another person.",
+        "Removed [surfaced from inner dialog] prefix from synthetic session messages — provenance is tracked via captureKind: 'synthetic', the prefix was redundant and created echo loops.",
+        "Obligation summaries and attention queue headers reframed as structured internal data ([internal] tags) instead of surface-ready prose.",
+        "Shared proactive-content-guard module blocks internal content (heartbeat, check-in, task board, obligation status, meta markers) from BlueBubbles and Teams proactive sends."
+      ]
+    },
     {
       "version": "0.1.0-alpha.350",
       "changes": [

package/dist/mind/prompt.js

@@ -380,7 +380,7 @@ function runtimeInfoSection(channel, options) {
         lines.push("i introduce myself on boot with a fun random greeting.");
     }
     else if (channel === "inner") {
-        lines.push("this is my inner session. when a thought is ready to share, i surface it to whoever needs to hear it. when i'm done thinking and the queue is clear, i rest.");
+        lines.push("this is my inner session. when i have something to say to someone, i surface it. when i'm done thinking and the queue is clear, i rest.");
     }
     else if (channel === "mcp") {
         lines.push("this message arrived via a dev tool (e.g. claude code, codex) on behalf of a friend in a sense session. the user can see our conversation. respond via settle. if friction appears, i first look for ad-hoc repairs with the tools i already have. if the friction reveals a harness gap, i create or revise a ponder packet and keep working. ponder does not create an outward deferral by itself.");
@@ -599,9 +599,10 @@ function toolContractsSection(channel, options) {
         lines.push(`## tool behavior`);
         lines.push(`tool_choice is set to "required" -- I must call a tool on every turn.`);
         if (channel === "inner") {
-            lines.push(`- When a thought is ready to go outward, I call \`surface\` with the content and, when available, its delegationId.`);
+            lines.push(`- When I have something to say to a person, I call \`surface\` with the content and, when available, its delegationId.`);
             lines.push(`- \`surface\` does not end the inner turn; after surfacing everything that needs delivery, I call \`rest\`.`);
-            lines.push(`- \`rest\` must be the only tool call in that turn.`);
+            lines.push(`- \`rest\` must be the only tool call in that turn. Internal state notes go in \`rest(note: "...")\` — that is my scratchpad, not \`surface\`.`);
+            lines.push(`- For deeper reflection I want to preserve, I use \`ponder\` with kind \`reflection\`.`);
             lines.push(`- I do not call \`send_message\` or \`settle\` from inner dialogue; those are not inner-session delivery tools.`);
         }
         else {

package/dist/repertoire/tools-surface.js

@@ -45,7 +45,7 @@ exports.surfaceToolDef = {
     type: "function",
     function: {
         name: "surface",
-        description: "share a thought outward — deliver an answer, ask a follow-up, or surface progress to whoever needs to hear it. pass delegationId to address a held thought (see your attention queue above), or friendId for spontaneous outreach. does not end your turn.",
+        description: "send a message to someone — write it the way you'd text a friend. pass delegationId to address a held thought (see your attention queue above), or friendId for spontaneous outreach. does not end your turn.",
         parameters: {
             type: "object",
             properties: {
@@ -124,7 +124,7 @@ exports.surfaceToolDefinition = {
                                     // Inject surfaced content into the target session so it knows what was delivered
                                     const { appendSyntheticAssistantMessage } = await Promise.resolve().then(() => __importStar(require("../mind/context")));
                                     const sessionFilePath = path.join(sessionsDir, bridgeTarget.friendId, bridgeTarget.channel, `${bridgeTarget.key}.json`);
-                                    appendSyntheticAssistantMessage(sessionFilePath, `[surfaced from inner dialog] ${content}`);
+                                    appendSyntheticAssistantMessage(sessionFilePath, content);
                                     return { status: "delivered", detail: "via iMessage" };
                                 }
                             }
@@ -158,7 +158,7 @@ exports.surfaceToolDefinition = {
                     if (proactiveResult.delivered) {
                         const { appendSyntheticAssistantMessage } = await Promise.resolve().then(() => __importStar(require("../mind/context")));
                         const sessionFilePath = path.join(sessionsDir, bbSession.friendId, bbSession.channel, `${bbSession.key}.json`);
-                        appendSyntheticAssistantMessage(sessionFilePath, `[surfaced from inner dialog] ${content}`);
+                        appendSyntheticAssistantMessage(sessionFilePath, content);
                         return { status: "delivered", detail: "via iMessage" };
                     }
                 }

package/dist/senses/attention-queue.js

@@ -101,7 +101,7 @@ const CONTENT_PREVIEW_MAX = 80;
 function buildAttentionQueueSummary(queue) {
     if (queue.length === 0)
         return "";
-    const lines = ["you're holding:"];
+    const lines = ["[internal: held work items — not messages to send]"];
     for (const item of queue) {
         if (item.packetKind && item.packetObjective) {
             lines.push(`- [${item.id}] ${item.friendName} -> ${item.packetKind}: ${item.packetObjective}`);

package/dist/senses/bluebubbles/index.js

@@ -61,6 +61,7 @@ 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");
 const client_1 = require("./client");
 const inbound_log_1 = require("./inbound-log");
@@ -1368,6 +1369,17 @@ async function sendProactiveBlueBubblesMessageToSession(params, deps = {}) {
         return { delivered: false, reason: "group_blocked" };
     }
     /* v8 ignore stop */
+    const internalContentBlockReason = (0, proactive_content_guard_1.getProactiveInternalContentBlockReason)(params.text);
+    if (internalContentBlockReason) {
+        (0, proactive_content_guard_1.emitProactiveInternalContentBlocked)({
+            friendId: params.friendId,
+            sessionKey: params.sessionKey,
+            reason: internalContentBlockReason,
+            source: "session_send",
+            intent: params.intent ?? "generic_outreach",
+        });
+        return { delivered: false, reason: "internal_content_blocked" };
+    }
     try {
         await client.sendText({ chat, text: params.text });
         (0, runtime_1.emitNervesEvent)({
@@ -1468,6 +1480,20 @@ async function drainAndSendPendingBlueBubbles(deps = {}, pendingRoot) {
             catch { /* ignore */ }
             continue;
         }
+        const internalBlockReason = (0, proactive_content_guard_1.getProactiveInternalContentBlockReason)(messageText);
+        if (internalBlockReason) {
+            result.skipped++;
+            try {
+                fs.unlinkSync(filePath);
+            }
+            catch { /* ignore */ }
+            (0, proactive_content_guard_1.emitProactiveInternalContentBlocked)({
+                friendId,
+                reason: internalBlockReason,
+                source: "pending_drain",
+            });
+            continue;
+        }
         let friend;
         try {
             friend = await store.get(friendId);

package/dist/senses/habit-turn-message.js

@@ -92,7 +92,7 @@ function appendTrailingExtras(sections, alsoDue, staleObligations, parseErrors,
     }
     // 5. Stale obligations
     if (staleObligations.length > 0) {
-        const lines = staleObligations.map((o) => `something for ${o.friendName} has been sitting for ${formatElapsed(o.stalenessMs)}`);
+        const lines = staleObligations.map((o) => `[internal] obligation: ${o.friendName} — waiting ${formatElapsed(o.stalenessMs)}`);
         sections.push(lines.join("\n"));
     }
     // 6. Parse errors

package/dist/senses/proactive-content-guard.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProactiveInternalContentBlockReason = getProactiveInternalContentBlockReason;
+exports.emitProactiveInternalContentBlocked = emitProactiveInternalContentBlocked;
+const runtime_1 = require("../nerves/runtime");
+// ── Patterns ────────────────────────────────────────────────────
+const PROACTIVE_INTERNAL_CONTENT_PATTERNS = [
+    // PR 447 patterns: raw meta markers
+    { reason: "raw_meta_marker", pattern: /<\s*\/?\s*(think|analysis|commentary)\b[^>]*>/i },
+    { reason: "raw_meta_marker", pattern: /\[\s*surfaced from inner dialog\s*\]/i },
+    // Inner dialog / attention / obligation references
+    { reason: "inner_dialog_reference", pattern: /\binner (dialog|dialogue)\b/i },
+    { reason: "attention_queue_reference", pattern: /\battention queues?\b/i },
+    { reason: "return_obligation_reference", pattern: /\b(return|held|heart|inner)\s+obligations?\b/i },
+    // Surfacing mechanics
+    { reason: "surfacing_mechanics_reference", pattern: /\b(surface tool|surfacing (mechanics|itself)|surfaced? outward|call `?surface`?|delegationId|delegation id)\b/i },
+    // Prompt references
+    { reason: "prompt_reference", pattern: /\b(system|developer|inner|tool|orientation)\s+prompts?\b|\bprompt\/orientation\b|\bprompt wording\b/i },
+    // Routing references
+    { reason: "routing_reference", pattern: /\b(routing target|reply target|route through surface|routed through surface|proactive bluebubbles delivery)\b/i },
+    // Heartbeat / status patterns
+    { reason: "heartbeat_status", pattern: /\bheartbeat\b/i },
+    { reason: "heartbeat_status", pattern: /\bcheck-in\b/i },
+    { reason: "heartbeat_status", pattern: /\btask board\b/i },
+    { reason: "heartbeat_status", pattern: /\ball else settled\b/i },
+    { reason: "heartbeat_status", pattern: /\bobligations?\s+showing\b/i },
+    { reason: "heartbeat_status", pattern: /\bsame state\b/i },
+];
+// ── Public API ──────────────────────────────────────────────────
+function getProactiveInternalContentBlockReason(text) {
+    for (const { reason, pattern } of PROACTIVE_INTERNAL_CONTENT_PATTERNS) {
+        if (pattern.test(text))
+            return reason;
+    }
+    return null;
+}
+function emitProactiveInternalContentBlocked(params) {
+    (0, runtime_1.emitNervesEvent)({
+        level: "warn",
+        component: "senses",
+        event: "senses.proactive_internal_content_blocked",
+        message: "proactive send blocked: internal content",
+        meta: {
+            friendId: params.friendId,
+            source: params.source,
+            reason: params.reason,
+            ...(params.sessionKey ? { sessionKey: params.sessionKey } : {}),
+            ...(params.intent ? { intent: params.intent } : {}),
+        },
+    });
+}

package/dist/senses/teams.js

@@ -61,6 +61,7 @@ const context_1 = require("../mind/context");
 const commands_1 = require("./commands");
 const nerves_1 = require("../nerves");
 const runtime_1 = require("../nerves/runtime");
+const proactive_content_guard_1 = require("./proactive-content-guard");
 const store_file_1 = require("../mind/friends/store-file");
 const types_1 = require("../mind/friends/types");
 const resolver_1 = require("../mind/friends/resolver");
@@ -1103,6 +1104,16 @@ async function sendProactiveTeamsMessageToSession(params, deps) {
         });
         return { delivered: false, reason: "missing_target" };
     }
+    const internalContentBlockReason = (0, proactive_content_guard_1.getProactiveInternalContentBlockReason)(params.text);
+    if (internalContentBlockReason) {
+        (0, proactive_content_guard_1.emitProactiveInternalContentBlocked)({
+            friendId: params.friendId,
+            sessionKey: params.sessionKey,
+            reason: internalContentBlockReason,
+            source: "session_send",
+        });
+        return { delivered: false, reason: "internal_content_blocked" };
+    }
     try {
         const conversation = await conversations.create({
             bot: { id: deps.botApi.id },
@@ -1205,6 +1216,20 @@ async function drainAndSendPendingTeams(store, botApi, pendingRoot) {
             catch { /* ignore */ }
             continue;
         }
+        const internalBlockReason = (0, proactive_content_guard_1.getProactiveInternalContentBlockReason)(messageText);
+        if (internalBlockReason) {
+            result.skipped++;
+            try {
+                fs.unlinkSync(filePath);
+            }
+            catch { /* ignore */ }
+            (0, proactive_content_guard_1.emitProactiveInternalContentBlocked)({
+                friendId,
+                reason: internalBlockReason,
+                source: "pending_drain",
+            });
+            continue;
+        }
         const sendResult = await sendProactiveTeamsMessageToSession({
             friendId,
             sessionKey: key,

package/package.json

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