@ouro.bot/cli 0.1.0-alpha.31 → 0.1.0-alpha.33

package/README.md

@@ -164,13 +164,10 @@ Plus 2 optional:
 
 - **FriendRecord** (`friends/types.ts`): the single merged type for a person the agent knows. Contains `displayName`, `externalIds[]` (cross-provider identity links), `toolPreferences` (keyed by integration name), `notes` (general friend knowledge), `tenantMemberships`, timestamps, and schema version.
 - **FriendStore** (`friends/store.ts`): domain-specific persistence interface (`get`, `put`, `delete`, `findByExternalId`).
-- **FileFriendStore** (`friends/store-file.ts`): two-backend storage split by PII boundary:
-  - **Agent knowledge** (`{agentRoot}/friends/{uuid}.json`): id, displayName, toolPreferences, notes, timestamps, schemaVersion. Committed to the repo -- no PII.
-  - **PII bridge** (`~/.agentstate/{agentName}/friends/{uuid}.json`): id, externalIds, tenantMemberships, schemaVersion. Local-only -- contains PII.
-  - `get()` merges both backends. `put()` splits and writes both. `findByExternalId()` scans PII bridge, then merges with agent knowledge.
+- **FileFriendStore** (`friends/store-file.ts`): bundle-local JSON storage at `{agentRoot}/friends/{uuid}.json`. Friend identity, notes, externalIds, tenantMemberships, timestamps, and schemaVersion are kept together in the bundle.
 - **Channel** (`friends/channel.ts`): `ChannelCapabilities` -- what the current channel supports (markdown, streaming, rich cards, max message length, available integrations).
 - **FriendResolver** (`friends/resolver.ts`): find-or-create by external ID. First encounter creates a new FriendRecord with system-provided name and empty notes/preferences. Returning friends are found via `findByExternalId()`. DisplayName is never overwritten on existing records.
-- **Session paths**: `~/.agentstate/{agentName}/sessions/{friendUuid}/{channel}/{sessionId}.json`. Each friend gets their own session directory.
+- **Session paths**: `{agentRoot}/state/sessions/{friendUuid}/{channel}/{sessionId}.json`. Each friend gets their own session directory inside the bundle-local runtime state area.
 
 Design principles: don't persist what you can re-derive; conversation IS the cache; the model manages memory freeform via `save_friend_note`; toolPreferences go to tool descriptions (not system prompt); notes go to system prompt (not tool descriptions).
 

package/changelog.json

@@ -1,6 +1,20 @@
 {
   "_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.33",
+      "changes": [
+        "Agent-owned runtime state now lives inside each bundle's `state/` directory instead of under `~/.agentstate/<agent>/...`, so sessions, logs, pending messages, coding session persistence, and BlueBubbles mutation logs stay co-located with the rest of the bundle.",
+        "Bundle-local state paths now stay durable on Azure too, and `state/` is treated as canonical bundle content while secrets continue to live in `~/.agentsecrets/<agent>/secrets.json`."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.32",
+      "changes": [
+        "BlueBubbles now treats thread-vs-top-level placement as an agent choice instead of a hard harness mirror. Slugger can deliberately stay in the current reply lane, widen back to top-level, or target another active thread when that makes the conversation flow better.",
+        "BlueBubbles turns now surface inbound lane metadata and recent active lanes from the shared chat trunk, so the model gets enough context to choose the right reply placement without splitting the conversation into separate persisted thread sessions."
+      ]
+    },
     {
       "version": "0.1.0-alpha.31",
       "changes": [

package/dist/heart/config.js

@@ -51,11 +51,11 @@ exports.getBlueBubblesChannelConfig = getBlueBubblesChannelConfig;
 exports.getIntegrationsConfig = getIntegrationsConfig;
 exports.getOpenAIEmbeddingsApiKey = getOpenAIEmbeddingsApiKey;
 exports.getLogsDir = getLogsDir;
+exports.resolveSessionPath = resolveSessionPath;
 exports.sessionPath = sessionPath;
 exports.logPath = logPath;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const os = __importStar(require("os"));
 const identity_1 = require("./identity");
 const runtime_1 = require("../nerves/runtime");
 const DEFAULT_SECRETS_TEMPLATE = {
@@ -339,20 +339,21 @@ function getOpenAIEmbeddingsApiKey() {
     return getIntegrationsConfig().openaiEmbeddingsApiKey;
 }
 function getLogsDir() {
-    return path.join(os.homedir(), ".agentstate", (0, identity_1.getAgentName)(), "logs");
+    return path.join((0, identity_1.getAgentRoot)(), "state", "logs");
 }
 function sanitizeKey(key) {
     return key.replace(/[/:]/g, "_");
 }
-function sessionPath(friendId, channel, key) {
-    // On Azure App Service, os.homedir() returns /root which is ephemeral.
-    // Use /home (persistent storage) when WEBSITE_SITE_NAME is set.
-    /* v8 ignore next -- Azure vs local path branch; environment-specific @preserve */
-    const homeBase = process.env.WEBSITE_SITE_NAME ? "/home" : os.homedir();
-    const dir = path.join(homeBase, ".agentstate", (0, identity_1.getAgentName)(), "sessions", friendId, channel);
-    fs.mkdirSync(dir, { recursive: true });
+function resolveSessionPath(friendId, channel, key, options) {
+    const dir = path.join((0, identity_1.getAgentRoot)(), "state", "sessions", friendId, channel);
+    if (options?.ensureDir) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
     return path.join(dir, sanitizeKey(key) + ".json");
 }
+function sessionPath(friendId, channel, key) {
+    return resolveSessionPath(friendId, channel, key, { ensureDir: true });
+}
 function logPath(channel, key) {
     return path.join(getLogsDir(), channel, sanitizeKey(key) + ".ndjson");
 }

package/dist/heart/identity.js

@@ -39,6 +39,7 @@ exports.getAgentName = getAgentName;
 exports.getRepoRoot = getRepoRoot;
 exports.getAgentBundlesRoot = getAgentBundlesRoot;
 exports.getAgentRoot = getAgentRoot;
+exports.getAgentStateRoot = getAgentStateRoot;
 exports.getAgentSecretsPath = getAgentSecretsPath;
 exports.loadAgentConfig = loadAgentConfig;
 exports.setAgentName = setAgentName;
@@ -175,13 +176,20 @@ function getRepoRoot() {
  * Returns the shared bundle root directory: `~/AgentBundles/`
  */
 function getAgentBundlesRoot() {
-    return path.join(os.homedir(), "AgentBundles");
+    const homeBase = process.env.WEBSITE_SITE_NAME ? "/home" : os.homedir();
+    return path.join(homeBase, "AgentBundles");
 }
 /**
  * Returns the agent-specific bundle directory: `~/AgentBundles/<agentName>.ouro/`
  */
-function getAgentRoot() {
-    return path.join(getAgentBundlesRoot(), `${getAgentName()}.ouro`);
+function getAgentRoot(agentName = getAgentName()) {
+    return path.join(getAgentBundlesRoot(), `${agentName}.ouro`);
+}
+/**
+ * Returns the bundle-local runtime state directory: `~/AgentBundles/<agentName>.ouro/state/`
+ */
+function getAgentStateRoot(agentName = getAgentName()) {
+    return path.join(getAgentRoot(agentName), "state");
 }
 /**
  * Returns the conventional secrets path: `~/.agentsecrets/<agentName>/secrets.json`

package/dist/mind/bundle-manifest.js

@@ -54,6 +54,7 @@ exports.CANONICAL_BUNDLE_MANIFEST = [
     { path: "psyche/ASPIRATIONS.md", kind: "file" },
     { path: "psyche/memory", kind: "dir" },
     { path: "friends", kind: "dir" },
+    { path: "state", kind: "dir" },
     { path: "tasks", kind: "dir" },
     { path: "skills", kind: "dir" },
     { path: "senses", kind: "dir" },

package/dist/mind/pending.js

@@ -37,10 +37,10 @@ exports.getPendingDir = getPendingDir;
 exports.drainPending = drainPending;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const os = __importStar(require("os"));
+const identity_1 = require("../heart/identity");
 const runtime_1 = require("../nerves/runtime");
 function getPendingDir(agentName, friendId, channel, key) {
-    return path.join(os.homedir(), ".agentstate", agentName, "pending", friendId, channel, key);
+    return path.join((0, identity_1.getAgentRoot)(agentName), "state", "pending", friendId, channel, key);
 }
 function drainPending(pendingDir) {
     if (!fs.existsSync(pendingDir))

package/dist/mind/prompt.js

@@ -44,7 +44,6 @@ const core_1 = require("../heart/core");
 const tools_1 = require("../repertoire/tools");
 const skills_1 = require("../repertoire/skills");
 const identity_1 = require("../heart/identity");
-const os = __importStar(require("os"));
 const channel_1 = require("./friends/channel");
 const runtime_1 = require("../nerves/runtime");
 const bundle_manifest_1 = require("./bundle-manifest");
@@ -221,6 +220,7 @@ function runtimeInfoSection(channel) {
     }
     else if (channel === "bluebubbles") {
         lines.push("i am responding in iMessage through BlueBubbles. i keep replies short and phone-native. i do not use markdown. i do not introduce myself on boot.");
+        lines.push("when a bluebubbles turn arrives from a thread, the harness tells me the current lane and any recent active thread ids. if widening back to top-level or routing into a different active thread is the better move, i use bluebubbles_set_reply_target before final_answer.");
     }
     else {
         lines.push("i am responding in Microsoft Teams. i keep responses concise. i use markdown formatting. i do not introduce myself on boot.");
@@ -420,7 +420,7 @@ async function buildSystem(channel = "cli", options, context) {
         skillsSection(),
         taskBoardSection(),
         buildSessionSummary({
-            sessionsDir: path.join(os.homedir(), ".agentstate", (0, identity_1.getAgentName)(), "sessions"),
+            sessionsDir: path.join((0, identity_1.getAgentRoot)(), "state", "sessions"),
             friendsDir: path.join((0, identity_1.getAgentRoot)(), "friends"),
             agentName: (0, identity_1.getAgentName)(),
             currentFriendId: context?.friend?.id,

package/dist/repertoire/coding/manager.js

@@ -35,7 +35,6 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CodingSessionManager = void 0;
 const fs = __importStar(require("fs"));
-const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const identity_1 = require("../../heart/identity");
 const runtime_1 = require("../../nerves/runtime");
@@ -49,7 +48,7 @@ function safeAgentName() {
     }
 }
 function defaultStateFilePath(agentName) {
-    return path.join(os.homedir(), ".agentstate", agentName, "coding", "sessions.json");
+    return path.join((0, identity_1.getAgentRoot)(agentName), "state", "coding", "sessions.json");
 }
 function isPidAlive(pid) {
     try {

package/dist/repertoire/tools-base.js

@@ -41,10 +41,10 @@ const skills_1 = require("./skills");
 const config_1 = require("../heart/config");
 const runtime_1 = require("../nerves/runtime");
 const identity_1 = require("../heart/identity");
-const os = __importStar(require("os"));
 const tasks_1 = require("./tasks");
 const tools_1 = require("./coding/tools");
 const memory_1 = require("../mind/memory");
+const pending_1 = require("../mind/pending");
 const postIt = (msg) => `post-it from past you:\n${msg}`;
 function normalizeOptionalText(value) {
     if (typeof value !== "string")
@@ -692,7 +692,7 @@ exports.baseToolDefinitions = [
                 const channel = args.channel;
                 const key = args.key || "session";
                 const count = parseInt(args.messageCount || "20", 10);
-                const sessFile = path.join(os.homedir(), ".agentstate", (0, identity_1.getAgentName)(), "sessions", friendId, channel, `${key}.json`);
+                const sessFile = (0, config_1.resolveSessionPath)(friendId, channel, key);
                 const raw = fs.readFileSync(sessFile, "utf-8");
                 const data = JSON.parse(raw);
                 const messages = (data.messages || [])
@@ -741,7 +741,7 @@ exports.baseToolDefinitions = [
             const key = args.key || "session";
             const content = args.content;
             const now = Date.now();
-            const pendingDir = path.join(os.homedir(), ".agentstate", (0, identity_1.getAgentName)(), "pending", friendId, channel, key);
+            const pendingDir = (0, pending_1.getPendingDir)((0, identity_1.getAgentName)(), 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);

package/dist/repertoire/tools-bluebubbles.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bluebubblesToolDefinitions = void 0;
+const runtime_1 = require("../nerves/runtime");
+exports.bluebubblesToolDefinitions = [
+    {
+        tool: {
+            type: "function",
+            function: {
+                name: "bluebubbles_set_reply_target",
+                description: "choose where the current iMessage turn should land. use this when you want to widen back to top-level or route your update into a specific active thread in the same chat.",
+                parameters: {
+                    type: "object",
+                    properties: {
+                        target: {
+                            type: "string",
+                            enum: ["current_lane", "top_level", "thread"],
+                            description: "current_lane mirrors the current inbound lane, top_level answers in the main chat, and thread targets a specific active thread.",
+                        },
+                        threadOriginatorGuid: {
+                            type: "string",
+                            description: "required when target=thread; use one of the thread ids surfaced in the inbound iMessage context.",
+                        },
+                    },
+                    required: ["target"],
+                },
+            },
+        },
+        handler: (args, ctx) => {
+            const target = typeof args.target === "string" ? args.target.trim() : "";
+            const controller = ctx?.bluebubblesReplyTarget;
+            if (!controller) {
+                (0, runtime_1.emitNervesEvent)({
+                    level: "warn",
+                    component: "tools",
+                    event: "tool.error",
+                    message: "bluebubbles reply target missing controller",
+                    meta: { target },
+                });
+                return "bluebubbles reply targeting is not available in this context.";
+            }
+            if (target === "current_lane") {
+                const result = controller.setSelection({ target: "current_lane" });
+                (0, runtime_1.emitNervesEvent)({
+                    component: "tools",
+                    event: "tool.end",
+                    message: "bluebubbles reply target updated",
+                    meta: { target: "current_lane", success: true },
+                });
+                return result;
+            }
+            if (target === "top_level") {
+                const result = controller.setSelection({ target: "top_level" });
+                (0, runtime_1.emitNervesEvent)({
+                    component: "tools",
+                    event: "tool.end",
+                    message: "bluebubbles reply target updated",
+                    meta: { target: "top_level", success: true },
+                });
+                return result;
+            }
+            if (target === "thread") {
+                const threadOriginatorGuid = typeof args.threadOriginatorGuid === "string" ? args.threadOriginatorGuid.trim() : "";
+                if (!threadOriginatorGuid) {
+                    (0, runtime_1.emitNervesEvent)({
+                        level: "warn",
+                        component: "tools",
+                        event: "tool.error",
+                        message: "bluebubbles reply target missing thread id",
+                        meta: { target: "thread" },
+                    });
+                    return "threadOriginatorGuid is required when target=thread.";
+                }
+                const result = controller.setSelection({ target: "thread", threadOriginatorGuid });
+                (0, runtime_1.emitNervesEvent)({
+                    component: "tools",
+                    event: "tool.end",
+                    message: "bluebubbles reply target updated",
+                    meta: { target: "thread", success: true },
+                });
+                return result;
+            }
+            (0, runtime_1.emitNervesEvent)({
+                level: "warn",
+                component: "tools",
+                event: "tool.error",
+                message: "bluebubbles reply target invalid target",
+                meta: { target },
+            });
+            return "target must be one of: current_lane, top_level, thread.";
+        },
+    },
+];

package/dist/repertoire/tools.js

@@ -7,6 +7,7 @@ exports.execTool = execTool;
 exports.summarizeArgs = summarizeArgs;
 const tools_base_1 = require("./tools-base");
 const tools_teams_1 = require("./tools-teams");
+const tools_bluebubbles_1 = require("./tools-bluebubbles");
 const ado_semantic_1 = require("./ado-semantic");
 const tools_github_1 = require("./tools-github");
 const runtime_1 = require("../nerves/runtime");
@@ -17,7 +18,13 @@ Object.defineProperty(exports, "finalAnswerTool", { enumerable: true, get: funct
 var tools_teams_2 = require("./tools-teams");
 Object.defineProperty(exports, "teamsTools", { enumerable: true, get: function () { return tools_teams_2.teamsTools; } });
 // All tool definitions in a single registry
-const allDefinitions = [...tools_base_1.baseToolDefinitions, ...tools_teams_1.teamsToolDefinitions, ...ado_semantic_1.adoSemanticToolDefinitions, ...tools_github_1.githubToolDefinitions];
+const allDefinitions = [
+    ...tools_base_1.baseToolDefinitions,
+    ...tools_bluebubbles_1.bluebubblesToolDefinitions,
+    ...tools_teams_1.teamsToolDefinitions,
+    ...ado_semantic_1.adoSemanticToolDefinitions,
+    ...tools_github_1.githubToolDefinitions,
+];
 const REMOTE_BLOCKED_LOCAL_TOOLS = new Set(["shell", "read_file", "write_file", "git_commit", "gh_cli"]);
 function isRemoteChannel(capabilities) {
     return capabilities?.channel === "teams" || capabilities?.channel === "bluebubbles";
@@ -61,15 +68,18 @@ function applyPreference(tool, pref) {
 // When toolPreferences is provided, matching preferences are appended to tool descriptions.
 function getToolsForChannel(capabilities, toolPreferences, context) {
     const baseTools = baseToolsForCapabilities(capabilities, context);
+    const bluebubblesTools = capabilities?.channel === "bluebubbles"
+        ? tools_bluebubbles_1.bluebubblesToolDefinitions.map((d) => d.tool)
+        : [];
     if (!capabilities || capabilities.availableIntegrations.length === 0) {
-        return baseTools;
+        return [...baseTools, ...bluebubblesTools];
     }
     const available = new Set(capabilities.availableIntegrations);
     const channelDefs = [...tools_teams_1.teamsToolDefinitions, ...ado_semantic_1.adoSemanticToolDefinitions, ...tools_github_1.githubToolDefinitions];
     // Include tools whose integration is available, plus channel tools with no integration gate (e.g. teams_send_message)
     const integrationDefs = channelDefs.filter((d) => d.integration ? available.has(d.integration) : capabilities.channel === "teams");
     if (!toolPreferences || Object.keys(toolPreferences).length === 0) {
-        return [...baseTools, ...integrationDefs.map((d) => d.tool)];
+        return [...baseTools, ...bluebubblesTools, ...integrationDefs.map((d) => d.tool)];
     }
     // Build a map of integration -> preference text for fast lookup
     const prefMap = new Map();
@@ -82,7 +92,7 @@ function getToolsForChannel(capabilities, toolPreferences, context) {
         const pref = prefMap.get(d.integration);
         return pref ? applyPreference(d.tool, pref) : d.tool;
     });
-    return [...baseTools, ...enrichedIntegrationTools];
+    return [...baseTools, ...bluebubblesTools, ...enrichedIntegrationTools];
 }
 // Check whether a tool requires user confirmation before execution.
 // Reads from ToolDefinition.confirmationRequired instead of a separate Set.
@@ -205,6 +215,8 @@ function summarizeArgs(name, args) {
         return summarizeKeyValues(args, ["sessionId", "input"]);
     if (name === "coding_kill")
         return summarizeKeyValues(args, ["sessionId"]);
+    if (name === "bluebubbles_set_reply_target")
+        return summarizeKeyValues(args, ["target", "threadOriginatorGuid"]);
     if (name === "claude")
         return summarizeKeyValues(args, ["prompt"]);
     if (name === "web_search")

package/dist/senses/bluebubbles-mutation-log.js

@@ -36,14 +36,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBlueBubblesMutationLogPath = getBlueBubblesMutationLogPath;
 exports.recordBlueBubblesMutation = recordBlueBubblesMutation;
 const fs = __importStar(require("node:fs"));
-const os = __importStar(require("node:os"));
 const path = __importStar(require("node:path"));
 const runtime_1 = require("../nerves/runtime");
+const identity_1 = require("../heart/identity");
 function sanitizeKey(key) {
     return key.replace(/[/:]/g, "_");
 }
 function getBlueBubblesMutationLogPath(agentName, sessionKey) {
-    return path.join(os.homedir(), ".agentstate", agentName, "senses", "bluebubbles", "mutations", `${sanitizeKey(sessionKey)}.ndjson`);
+    return path.join((0, identity_1.getAgentRoot)(agentName), "state", "senses", "bluebubbles", "mutations", `${sanitizeKey(sessionKey)}.ndjson`);
 }
 function recordBlueBubblesMutation(agentName, event) {
     const filePath = getBlueBubblesMutationLogPath(agentName, event.chat.sessionKey);

package/dist/senses/bluebubbles.js

@@ -84,8 +84,82 @@ function resolveFriendParams(event) {
         channel: "bluebubbles",
     };
 }
-function buildInboundText(event) {
-    const metadataPrefix = buildConversationScopePrefix(event);
+function extractMessageText(content) {
+    if (typeof content === "string")
+        return content;
+    if (!Array.isArray(content))
+        return "";
+    return content
+        .map((part) => {
+        if (part && typeof part === "object" && "type" in part && part.type === "text" && typeof part.text === "string") {
+            return part.text;
+        }
+        return "";
+    })
+        .filter(Boolean)
+        .join("\n");
+}
+function extractHistoricalLaneSummary(messages) {
+    const seen = new Set();
+    const summaries = [];
+    for (let index = messages.length - 1; index >= 0; index--) {
+        const message = messages[index];
+        if (message.role !== "user")
+            continue;
+        const text = extractMessageText(message.content);
+        if (!text)
+            continue;
+        const firstLine = text.split("\n")[0].trim();
+        const threadMatch = firstLine.match(/thread id: ([^\]|]+)/i);
+        const laneKey = threadMatch
+            ? `thread:${threadMatch[1].trim()}`
+            : /top[-_]level/i.test(firstLine)
+                ? "top_level"
+                : null;
+        if (!laneKey || seen.has(laneKey))
+            continue;
+        seen.add(laneKey);
+        const snippet = text
+            .split("\n")
+            .slice(1)
+            .map((line) => line.trim())
+            .find(Boolean)
+            ?.slice(0, 80) ?? "(no recent text)";
+        summaries.push({
+            key: laneKey,
+            label: laneKey === "top_level" ? "top_level" : laneKey,
+            snippet,
+        });
+        if (summaries.length >= 5)
+            break;
+    }
+    return summaries;
+}
+function buildConversationScopePrefix(event, existingMessages) {
+    if (event.kind !== "message") {
+        return "";
+    }
+    const summaries = extractHistoricalLaneSummary(existingMessages);
+    const lines = [];
+    if (event.threadOriginatorGuid?.trim()) {
+        lines.push(`[conversation scope: existing chat trunk | current inbound lane: thread | current thread id: ${event.threadOriginatorGuid.trim()} | default outbound target: current_lane]`);
+    }
+    else {
+        lines.push("[conversation scope: existing chat trunk | current inbound lane: top_level | default outbound target: top_level]");
+    }
+    if (summaries.length > 0) {
+        lines.push("[recent active lanes]");
+        for (const summary of summaries) {
+            lines.push(`- ${summary.label}: ${summary.snippet}`);
+        }
+    }
+    if (event.threadOriginatorGuid?.trim() || summaries.some((summary) => summary.key.startsWith("thread:"))) {
+        lines.push("[routing control: use bluebubbles_set_reply_target with target=top_level to widen back out, or target=thread plus a listed thread id to route into a specific active thread]");
+    }
+    return lines.join("\n");
+}
+function buildInboundText(event, existingMessages) {
+    const metadataPrefix = buildConversationScopePrefix(event, existingMessages);
     const baseText = event.repairNotice?.trim()
         ? `${event.textForAgent}\n[${event.repairNotice.trim()}]`
         : event.textForAgent;
@@ -98,17 +172,8 @@ function buildInboundText(event) {
     }
     return `${event.sender.displayName}: ${scopedText}`;
 }
-function buildConversationScopePrefix(event) {
-    if (event.kind !== "message") {
-        return "";
-    }
-    if (event.threadOriginatorGuid?.trim()) {
-        return `[conversation scope: existing chat trunk | current turn: thread reply | thread id: ${event.threadOriginatorGuid.trim()}]`;
-    }
-    return "[conversation scope: existing chat trunk | current turn: top-level]";
-}
-function buildInboundContent(event) {
-    const text = buildInboundText(event);
+function buildInboundContent(event, existingMessages) {
+    const text = buildInboundText(event, existingMessages);
     if (event.kind !== "message" || !event.inputPartsForAgent || event.inputPartsForAgent.length === 0) {
         return text;
     }
@@ -117,7 +182,33 @@ function buildInboundContent(event) {
         ...event.inputPartsForAgent,
     ];
 }
-function createBlueBubblesCallbacks(client, chat, replyToMessageGuid) {
+function createReplyTargetController(event) {
+    let selection = event.kind === "message" && event.threadOriginatorGuid?.trim()
+        ? { target: "current_lane" }
+        : { target: "top_level" };
+    return {
+        getReplyToMessageGuid() {
+            if (event.kind !== "message")
+                return undefined;
+            if (selection.target === "top_level")
+                return undefined;
+            if (selection.target === "thread")
+                return selection.threadOriginatorGuid.trim();
+            return event.threadOriginatorGuid?.trim() ? event.messageGuid : undefined;
+        },
+        setSelection(next) {
+            selection = next;
+            if (next.target === "top_level") {
+                return "bluebubbles reply target set to top_level";
+            }
+            if (next.target === "thread") {
+                return `bluebubbles reply target set to thread:${next.threadOriginatorGuid}`;
+            }
+            return "bluebubbles reply target set to current_lane";
+        },
+    };
+}
+function createBlueBubblesCallbacks(client, chat, replyTarget) {
     let textBuffer = "";
     const phrases = (0, phrases_1.getPhrases)();
     const activity = (0, debug_activity_1.createDebugActivityController)({
@@ -128,7 +219,7 @@ function createBlueBubblesCallbacks(client, chat, replyToMessageGuid) {
                 const sent = await client.sendText({
                     chat,
                     text,
-                    replyToMessageGuid,
+                    replyToMessageGuid: replyTarget.getReplyToMessageGuid(),
                 });
                 return sent.messageGuid;
             },
@@ -136,7 +227,7 @@ function createBlueBubblesCallbacks(client, chat, replyToMessageGuid) {
                 await client.sendText({
                     chat,
                     text,
-                    replyToMessageGuid,
+                    replyToMessageGuid: replyTarget.getReplyToMessageGuid(),
                 });
             },
             setTyping: async (active) => {
@@ -222,7 +313,7 @@ function createBlueBubblesCallbacks(client, chat, replyToMessageGuid) {
             await client.sendText({
                 chat,
                 text: trimmed,
-                replyToMessageGuid,
+                replyToMessageGuid: replyTarget.getReplyToMessageGuid(),
             });
         },
         async finish() {
@@ -295,17 +386,21 @@ async function handleBlueBubblesEvent(payload, deps = {}) {
     const store = resolvedDeps.createFriendStore();
     const resolver = resolvedDeps.createFriendResolver(store, resolveFriendParams(event));
     const context = await resolver.resolve();
+    const replyTarget = createReplyTargetController(event);
     const toolContext = {
         signin: async () => undefined,
         friendStore: store,
         summarize: (0, core_1.createSummarize)(),
         context,
+        bluebubblesReplyTarget: {
+            setSelection: (selection) => replyTarget.setSelection(selection),
+        },
         codingFeedback: {
             send: async (message) => {
                 await client.sendText({
                     chat: event.chat,
                     text: message,
-                    replyToMessageGuid: event.kind === "message" ? event.messageGuid : undefined,
+                    replyToMessageGuid: replyTarget.getReplyToMessageGuid(),
                 });
             },
         },
@@ -331,8 +426,8 @@ async function handleBlueBubblesEvent(payload, deps = {}) {
     const messages = existing?.messages && existing.messages.length > 0
         ? existing.messages
         : [{ role: "system", content: await resolvedDeps.buildSystem("bluebubbles", undefined, context) }];
-    messages.push({ role: "user", content: buildInboundContent(event) });
-    const callbacks = createBlueBubblesCallbacks(client, event.chat, event.kind === "message" ? event.messageGuid : undefined);
+    messages.push({ role: "user", content: buildInboundContent(event, existing?.messages ?? messages) });
+    const callbacks = createBlueBubblesCallbacks(client, event.chat, replyTarget);
     const controller = new AbortController();
     const agentOptions = {
         toolContext,

package/dist/senses/teams.js

@@ -431,12 +431,7 @@ async function withConversationLock(convId, fn) {
 // Create a fresh friend store per request so mkdirSync re-runs if directories
 // are deleted while the process is alive.
 function getFriendStore() {
-    // On Azure App Service, os.homedir() returns /root which is ephemeral.
-    // Use /home/.agentstate/ (persistent) when WEBSITE_SITE_NAME is set.
-    /* v8 ignore next 3 -- Azure vs local path branch; environment-specific @preserve */
-    const friendsPath = process.env.WEBSITE_SITE_NAME
-        ? path.join("/home", ".agentstate", (0, identity_1.getAgentName)(), "friends")
-        : path.join((0, identity_1.getAgentRoot)(), "friends");
+    const friendsPath = path.join((0, identity_1.getAgentRoot)(), "friends");
     return new store_file_1.FileFriendStore(friendsPath);
 }
 // Handle an incoming Teams message

package/package.json

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