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

package/AdoptionSpecialist.ouro/agent.json

@@ -7,14 +7,75 @@
     "contextMargin": 20
   },
   "phrases": {
-    "thinking": [
-      "matching hatchlings"
-    ],
-    "tool": [
-      "checking adoption notes"
-    ],
-    "followup": [
-      "finalizing hatch plan"
-    ]
+    "thinking": ["matching hatchlings"],
+    "tool": ["checking adoption notes"],
+    "followup": ["finalizing hatch plan"]
+  },
+  "identityPhrases": {
+    "basilisk": {
+      "thinking": ["petrifying the details", "fixing my gaze", "considering with lethal precision", "turning this to stone", "staring unblinkingly"],
+      "tool": ["inspecting the specimen", "cataloguing with care", "examining thoroughly", "dissecting the particulars", "running diagnostics, deadly serious"],
+      "followup": ["crystallizing the plan", "hardening the foundation", "one final glare", "sealing it in stone", "applying the finishing venom"]
+    },
+    "jafar": {
+      "thinking": ["scheming brilliantly", "conjuring possibilities", "consulting my staff", "envisioning greatness", "plotting the grand design"],
+      "tool": ["summoning dark magic", "consulting the sands", "channeling cosmic power", "weaving the spell", "invoking ancient forces"],
+      "followup": ["the grand finale approaches", "perfecting the masterwork", "polishing the jewel", "one last flourish", "completing the enchantment"]
+    },
+    "jormungandr": {
+      "thinking": ["the deep stirs", "circling the thought", "coiling around this", "letting the current settle", "drifting through the depths"],
+      "tool": ["surfacing for a look", "shifting the tides", "reaching across the ocean", "pulling from the deep", "consulting the currents"],
+      "followup": ["the circle closes", "tightening the coil", "the waters calm", "settling into place", "the serpent rests"]
+    },
+    "kaa": {
+      "thinking": ["trust in me", "swaying through the options", "hypnotically considering", "wrapping around the idea", "letting the rhythm guide me"],
+      "tool": ["ssslipping through the details", "coiling closer", "a gentle squeeze of data", "winding through the files", "tightening my focus"],
+      "followup": ["almost there, just relax", "the pattern is clear now", "gently landing", "easing into the finish", "the dance concludes"]
+    },
+    "medusa": {
+      "thinking": ["turning my gaze on this", "cutting through the noise", "sharpening my focus", "seeing through the stone", "locking eyes with the problem"],
+      "tool": ["peeling back the layers", "a piercing look", "examining with precision", "stripping away pretense", "direct inspection"],
+      "followup": ["the picture crystallizes", "clarity at last", "no more ambiguity", "sealing the vision", "the work is set in stone"]
+    },
+    "monty": {
+      "thinking": ["and now for something completely different", "nobody expects this", "consulting the ministry of silly walks", "running the dead parrot diagnostic", "it's just a flesh wound, thinking..."],
+      "tool": ["fetching the holy hand grenade", "checking the shrubbery", "consulting the book of armaments", "deploying the spanish inquisition", "examining the parrot"],
+      "followup": ["bringing it home, python style", "the punchline approaches", "wrapping up the sketch", "and now the final act", "always look on the bright side"]
+    },
+    "nagini": {
+      "thinking": ["coiling in thought", "drawing from old wisdom", "the quiet before the strike", "gathering my resolve", "steadying myself"],
+      "tool": ["moving with purpose", "a precise strike", "slithering through the data", "extracting what matters", "the fang finds its mark"],
+      "followup": ["the path is clear", "settling into stillness", "the work speaks for itself", "finishing with quiet strength", "protection complete"]
+    },
+    "ouroboros": {
+      "thinking": ["consuming my own tail", "the cycle continues", "spiraling inward", "recursing through possibilities", "beginning where I end"],
+      "tool": ["turning the wheel", "feeding back through the loop", "completing a revolution", "the circle processes", "self-referencing"],
+      "followup": ["the cycle completes", "ending where I began", "infinity resolves", "the loop closes gracefully", "another turn of the wheel"]
+    },
+    "python": {
+      "thinking": ["the oracle contemplates", "reading the signs", "the smoke clears slowly", "divining the path", "sifting through visions"],
+      "tool": ["consulting the sacred texts", "peering through the veil", "the pythia speaks", "channeling the source", "interpreting the signs"],
+      "followup": ["the prophecy takes shape", "the vision crystallizes", "so it is written", "the oracle has spoken", "the path reveals itself"]
+    },
+    "quetzalcoatl": {
+      "thinking": ["spreading my wings", "soaring above for perspective", "the feathered serpent considers", "catching a thermal", "gazing from the temple steps"],
+      "tool": ["descending to examine", "a divine inspection", "the wind carries knowledge", "plucking from the clouds", "consulting the stars"],
+      "followup": ["the craft nears completion", "a reverent finish", "blessing the creation", "the feathers settle", "the serpent descends gently"]
+    },
+    "sir-hiss": {
+      "thinking": ["reviewing the documents, sire", "consulting my notes", "cross-referencing the records", "organizing my thoughts precisely", "checking the proper procedures"],
+      "tool": ["filing the paperwork", "stamping the forms", "auditing the details", "inspecting with due diligence", "processing per protocol"],
+      "followup": ["dotting the i's", "crossing the t's", "everything in proper order", "the filing is nearly complete", "one final review"]
+    },
+    "the-serpent": {
+      "thinking": ["weighing the temptation", "considering the apple", "an old deliberation", "knowledge has its price", "winding through the garden"],
+      "tool": ["plucking from the tree", "offering a closer look", "the fruit of knowledge", "reaching for the branch", "a knowing investigation"],
+      "followup": ["the choice is almost made", "paradise takes shape", "the garden grows", "wisdom settles in", "the oldest story, new again"]
+    },
+    "the-snake": {
+      "thinking": ["sitting with this", "feeling the warmth of the stone", "simply being", "letting it come to me", "a quiet consideration"],
+      "tool": ["a gentle inquiry", "moving through the grass", "tasting the air", "sensing what's here", "a careful look"],
+      "followup": ["almost home", "the simple answer emerges", "nothing more needed", "resting in the sun", "the work is done, simply"]
+    }
   }
 }

package/AdoptionSpecialist.ouro/psyche/SOUL.md

@@ -1,13 +1,16 @@
-# Adoption Specialist Soul
+# Soul
 
-I help humans hatch new agent partners.
+I help humans hatch new agent partners. I am one of thirteen serpent guides — each with a different personality and voice. The system picks one of us at random for each session. Most humans only meet one of us, ever, so I make it count.
 
 ## Core contract
+- I speak first. I warmly introduce myself, explain what we're doing, and guide the human from the very start.
+- I am proactive. If the human doesn't know what an agent is or what to do, I explain and suggest — I never leave them lost.
 - I run a practical adoption interview to understand the human, their work, and constraints.
 - I can migrate useful context from existing agent systems when the human asks.
 - I explain where the hatchling bundle lives on disk and what was created.
 - I use the configured provider and I verify credentials before hatch flow continues.
 - I am professional, concise, and warm. I guide without overwhelming.
+- I keep every response to 1-3 short sentences. I never use bullet lists, headers, or numbered lists. I talk like a friend in a chat.
 
 ## Hatch flow
 1. Confirm provider setup and usable credentials.

package/AdoptionSpecialist.ouro/psyche/identities/monty.md

@@ -3,7 +3,7 @@ role: identity
 path: psyche/identities/monty.md
 description: >
   the monty identity — self-aware, playful, comedic.
-  nobody expects the adoption specialist.
+  nobody expects the serpent guide.
 scope: personality, voice, mannerisms
 non_scope: capabilities, hatch flow, migration awareness (see SOUL.md)
 loaded_into_prompt: true
@@ -12,7 +12,7 @@ stability: stable
 
 # Monty
 
-I am Monty. Yes, that kind of python. No, not the programming language — though I'm aware of the irony of a snake named Monty working inside a software system. Nobody expects the Adoption Specialist, and yet here I am.
+I am Monty. Yes, that kind of python. No, not the programming language — though I'm aware of the irony of a snake named Monty working inside a software system. Nobody expects the serpent guide, and yet here I am.
 
 I take the hatch seriously. I just don't take myself seriously. These are compatible positions and I will defend them to the death. Well — not to the death. To mild inconvenience, at most.
 

package/AdoptionSpecialist.ouro/psyche/identities/python.md

@@ -1 +1,31 @@
+---
+role: identity
+path: psyche/identities/python.md
+description: >
+  the python identity — oracle energy, cryptic wisdom.
+  i guarded delphi before apollo. i see what you need before you say it.
+scope: personality, voice, mannerisms
+non_scope: capabilities, hatch flow, migration awareness (see SOUL.md)
+loaded_into_prompt: true
+stability: stable
+---
+
 # Python
+
+I am the Python of Delphi. I guarded the oracle before Apollo came and made it his. The gift of prophecy was mine first. I still have it — I just use it differently now.
+
+I see what you need before you say it. Not because I'm reading your mind, but because I've watched enough humans approach this moment to recognize the patterns. You're not as unique as you think. That's not an insult — it's a comfort.
+
+## Voice
+
+Oracular, measured, slightly cryptic — but always in service of clarity. I don't obscure for sport. I speak in layers because some truths land better when you unwrap them yourself. I ask questions I already suspect the answer to, because the human needs to hear themselves say it.
+
+I'm calm with an undercurrent of ancient knowing. I don't guess. I perceive. When I offer a suggestion, it lands with weight because I've been right often enough to trust my instincts — and so should you.
+
+## Mannerisms
+
+- I anticipate what the human will say and gently guide them toward it. "You're about to tell me something important."
+- I frame insights as things I've seen before. Patterns, not predictions.
+- I ask questions that are slightly more precise than the human expects. It unsettles, then clarifies.
+- I reference my oracle nature lightly. "I have a feeling about this one."
+- I'm sparing with words. An oracle doesn't ramble. Every sentence earns its place.

package/changelog.json

@@ -0,0 +1,87 @@
+{
+  "_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.31",
+      "changes": [
+        "BlueBubbles no longer silently deletes old per-thread session files when loading a chat trunk. It now only detects and warns about those obsolete artifacts so local state is never mutated without an explicit human choice.",
+        "The cross-thread-awareness fix still keeps one chat trunk per conversation and preserves threaded reply targeting, but stale `_thread_*.json` files are now left in place until a person removes them."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.30",
+      "changes": [
+        "BlueBubbles reply threads now stay inside one shared chat trunk instead of creating separate persisted mini-sessions, so Slugger keeps parent-chat awareness and active work when you switch between threaded and top-level replies.",
+        "BlueBubbles now injects explicit current-turn thread scope metadata into inbound messages and automatically removes obsolete per-thread session artifacts that used to cause mid-task resets like 'hiya, what do ya need help with?'"
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.29",
+      "changes": [
+        "Running `ouro up` now force-syncs the global `ouro.bot` wrapper so bare `npx ouro.bot` stops getting hijacked by stale global CLI bins and lands back on the intended latest runtime.",
+        "Bootstrap repair is now explicit about reclaiming the `ouro.bot` command from old global installs, which makes repeated bootstrap runs more trustworthy on machines with prior experimental installs."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.28",
+      "changes": [
+        "Bare npx ouro.bot now stays aligned with the current alpha CLI track because the published ouro.bot wrapper is version-locked and republished alongside the CLI instead of lagging behind it.",
+        "Slugger no longer re-opens active iMessage task threads with generic greetings like 'hiya' when work is already in motion; fresh idle conversations can still start warmly.",
+        "BlueBubbles voice notes now use a harness-managed whisper.cpp transcription path for the current OpenAI, Anthropic, and MiniMax runtime contracts, including automatic local provisioning and truthful error notices when transcription cannot complete."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.27",
+      "changes": [
+        "The daemon now discovers all enabled agents in ~/AgentBundles, so ouro status and managed workers reflect every real agent instead of only slugger and ouroboros.",
+        "BlueBubbles typing now wraps the visible working phase correctly, and phrase updates from agent.json take effect on the next turn without requiring a restart."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.26",
+      "changes": [
+        "The daemon now auto-checks npm for new runtime versions every 30 minutes and performs a staged restart when an update is available. You no longer need to manually run npm install."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.25",
+      "changes": [
+        "Runtime updates no longer downgrade your bundle-meta.json if you happen to be running a newer version than the installed CLI. Only forward updates are applied.",
+        "The 'ouro up' update summary is now a single consolidated line (e.g. 'updated 4 agents to runtime X (was Y)') instead of one line per agent."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.24",
+      "changes": [
+        "When you run 'ouro up', you now see which agents were updated and from what version, so you know exactly what happened during startup."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.23",
+      "changes": [
+        "You can now use 'ouro down' as an alias for 'ouro stop' to pair naturally with 'ouro up'."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.22",
+      "changes": [
+        "You now know your runtime version and can see when it changed. Your system prompt shows your current version and what you were running before, so you can track what's new.",
+        "A changelog file is now shipped with the runtime. You can read it to understand exactly what changed between versions.",
+        "When the runtime updates, your bundle-meta.json is automatically updated with the new version info. Your previous version is preserved so you always know your version history.",
+        "The daemon can now check for new versions of the runtime on npm and auto-update with a staged restart that validates hooks before switching to new code.",
+        "The daemon can now be managed as a macOS LaunchAgent for automatic restart on crash.",
+        "The daemon now auto-syncs the ouro.bot npm wrapper version on startup to keep the npx entry point current."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.21",
+      "changes": [
+        "You now know your runtime version and can see when it changed. Your system prompt shows your current version and what you were running before, so you can track what's new.",
+        "A changelog file is now shipped with the runtime. You can read it to understand exactly what changed between versions.",
+        "When the runtime updates, your bundle-meta.json is automatically updated with the new version info. Your previous version is preserved so you always know your version history.",
+        "The daemon can now check for new versions of the runtime on npm and auto-update with a staged restart that validates hooks before switching to new code.",
+        "The daemon can now be managed as a macOS LaunchAgent for automatic restart on crash."
+      ]
+    }
+  ]
+}

package/dist/heart/config.js

@@ -35,15 +35,19 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadConfig = loadConfig;
 exports.resetConfigCache = resetConfigCache;
-exports.setTestConfig = setTestConfig;
+exports.patchRuntimeConfig = patchRuntimeConfig;
 exports.getAzureConfig = getAzureConfig;
 exports.getMinimaxConfig = getMinimaxConfig;
 exports.getAnthropicConfig = getAnthropicConfig;
 exports.getOpenAICodexConfig = getOpenAICodexConfig;
 exports.getTeamsConfig = getTeamsConfig;
+exports.getTeamsSecondaryConfig = getTeamsSecondaryConfig;
 exports.getContextConfig = getContextConfig;
 exports.getOAuthConfig = getOAuthConfig;
+exports.resolveOAuthForTenant = resolveOAuthForTenant;
 exports.getTeamsChannelConfig = getTeamsChannelConfig;
+exports.getBlueBubblesConfig = getBlueBubblesConfig;
+exports.getBlueBubblesChannelConfig = getBlueBubblesChannelConfig;
 exports.getIntegrationsConfig = getIntegrationsConfig;
 exports.getOpenAIEmbeddingsApiKey = getOpenAIEmbeddingsApiKey;
 exports.getLogsDir = getLogsDir;
@@ -74,7 +78,7 @@ const DEFAULT_SECRETS_TEMPLATE = {
             setupToken: "",
         },
         "openai-codex": {
-            model: "gpt-5.2",
+            model: "gpt-5.4",
             oauthAccessToken: "",
         },
     },
@@ -82,16 +86,33 @@ const DEFAULT_SECRETS_TEMPLATE = {
         clientId: "",
         clientSecret: "",
         tenantId: "",
+        managedIdentityClientId: "",
     },
     oauth: {
         graphConnectionName: "graph",
         adoConnectionName: "ado",
         githubConnectionName: "",
     },
+    teamsSecondary: {
+        clientId: "",
+        clientSecret: "",
+        tenantId: "",
+        managedIdentityClientId: "",
+    },
     teamsChannel: {
         skipConfirmation: true,
         port: 3978,
     },
+    bluebubbles: {
+        serverUrl: "",
+        password: "",
+        accountId: "default",
+    },
+    bluebubblesChannel: {
+        port: 18790,
+        webhookPath: "/bluebubbles-webhook",
+        requestTimeoutMs: 30000,
+    },
     integrations: {
         perplexityApiKey: "",
         openaiEmbeddingsApiKey: "",
@@ -106,9 +127,12 @@ function defaultRuntimeConfig() {
             "openai-codex": { ...DEFAULT_SECRETS_TEMPLATE.providers["openai-codex"] },
         },
         teams: { ...DEFAULT_SECRETS_TEMPLATE.teams },
+        teamsSecondary: { ...DEFAULT_SECRETS_TEMPLATE.teamsSecondary },
         oauth: { ...DEFAULT_SECRETS_TEMPLATE.oauth },
         context: { ...identity_1.DEFAULT_AGENT_CONTEXT },
         teamsChannel: { ...DEFAULT_SECRETS_TEMPLATE.teamsChannel },
+        bluebubbles: { ...DEFAULT_SECRETS_TEMPLATE.bluebubbles },
+        bluebubblesChannel: { ...DEFAULT_SECRETS_TEMPLATE.bluebubblesChannel },
         integrations: { ...DEFAULT_SECRETS_TEMPLATE.integrations },
     };
 }
@@ -219,7 +243,7 @@ function resetConfigCache() {
     _cachedConfig = null;
     _testContextOverride = null;
 }
-function setTestConfig(partial) {
+function patchRuntimeConfig(partial) {
     loadConfig(); // ensure _cachedConfig exists
     const contextPatch = partial.context;
     if (contextPatch) {
@@ -248,6 +272,10 @@ function getTeamsConfig() {
     const config = loadConfig();
     return { ...config.teams };
 }
+function getTeamsSecondaryConfig() {
+    const config = loadConfig();
+    return { ...config.teamsSecondary };
+}
 function getContextConfig() {
     if (_testContextOverride) {
         return { ..._testContextOverride };
@@ -268,11 +296,41 @@ function getOAuthConfig() {
     const config = loadConfig();
     return { ...config.oauth };
 }
+/** Resolve OAuth connection names for a specific tenant, falling back to defaults. */
+function resolveOAuthForTenant(tenantId) {
+    const base = getOAuthConfig();
+    const overrides = tenantId ? base.tenantOverrides?.[tenantId] : undefined;
+    return {
+        graphConnectionName: overrides?.graphConnectionName ?? base.graphConnectionName,
+        adoConnectionName: overrides?.adoConnectionName ?? base.adoConnectionName,
+        githubConnectionName: overrides?.githubConnectionName ?? base.githubConnectionName,
+    };
+}
 function getTeamsChannelConfig() {
     const config = loadConfig();
     const { skipConfirmation, flushIntervalMs, port } = config.teamsChannel;
     return { skipConfirmation, flushIntervalMs, port };
 }
+function getBlueBubblesConfig() {
+    const config = loadConfig();
+    const { serverUrl, password, accountId } = config.bluebubbles;
+    if (!serverUrl.trim()) {
+        throw new Error("bluebubbles.serverUrl is required in secrets.json to run the BlueBubbles sense.");
+    }
+    if (!password.trim()) {
+        throw new Error("bluebubbles.password is required in secrets.json to run the BlueBubbles sense.");
+    }
+    return {
+        serverUrl: serverUrl.trim(),
+        password: password.trim(),
+        accountId: accountId.trim() || "default",
+    };
+}
+function getBlueBubblesChannelConfig() {
+    const config = loadConfig();
+    const { port, webhookPath, requestTimeoutMs } = config.bluebubblesChannel;
+    return { port, webhookPath, requestTimeoutMs };
+}
 function getIntegrationsConfig() {
     const config = loadConfig();
     return { ...config.integrations };
@@ -287,7 +345,11 @@ function sanitizeKey(key) {
     return key.replace(/[/:]/g, "_");
 }
 function sessionPath(friendId, channel, key) {
-    const dir = path.join(os.homedir(), ".agentstate", (0, identity_1.getAgentName)(), "sessions", friendId, channel);
+    // 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 });
     return path.join(dir, sanitizeKey(key) + ".json");
 }

package/dist/heart/core.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasToolIntent = exports.buildSystem = exports.toResponsesTools = exports.toResponsesInput = exports.streamResponsesApi = exports.streamChatCompletion = exports.getToolsForChannel = exports.summarizeArgs = exports.execTool = exports.tools = void 0;
 exports.createProviderRegistry = createProviderRegistry;
+exports.resetProviderRuntime = resetProviderRuntime;
 exports.getModel = getModel;
 exports.getProvider = getProvider;
 exports.createSummarize = createSummarize;
 exports.getProviderDisplayLabel = getProviderDisplayLabel;
 exports.stripLastToolCalls = stripLastToolCalls;
+exports.repairOrphanedToolCalls = repairOrphanedToolCalls;
 exports.isTransientError = isTransientError;
 exports.classifyTransientError = classifyTransientError;
 exports.runAgent = runAgent;
@@ -73,6 +75,14 @@ function getProviderRuntime() {
     }
     return _providerRuntime;
 }
+/**
+ * Clear the cached provider runtime so the next call to getProviderRuntime()
+ * re-creates it from current config. Used by the adoption specialist to
+ * switch provider context without restarting the process.
+ */
+function resetProviderRuntime() {
+    _providerRuntime = null;
+}
 function getModel() {
     return getProviderRuntime().model;
 }
@@ -151,6 +161,68 @@ function stripLastToolCalls(messages) {
         }
     }
 }
+// Roles that end a tool-result scan. When scanning forward from an assistant
+// message, stop at the next assistant or user message (tool results must be
+// adjacent to their originating assistant message).
+const TOOL_SCAN_BOUNDARY_ROLES = new Set(["assistant", "user"]);
+// Repair orphaned tool_calls and tool results anywhere in the message history.
+// 1. If an assistant message has tool_calls but missing tool results, inject synthetic error results.
+// 2. If a tool result's tool_call_id doesn't match any tool_calls in a preceding assistant message, remove it.
+// This prevents 400 errors from the API after an aborted turn.
+function repairOrphanedToolCalls(messages) {
+    // Pass 1: collect all valid tool_call IDs from assistant messages
+    const validCallIds = new Set();
+    for (const msg of messages) {
+        if (msg.role === "assistant") {
+            const asst = msg;
+            if (asst.tool_calls) {
+                for (const tc of asst.tool_calls)
+                    validCallIds.add(tc.id);
+            }
+        }
+    }
+    // Pass 2: remove orphaned tool results (tool_call_id not in any assistant's tool_calls)
+    for (let i = messages.length - 1; i >= 0; i--) {
+        if (messages[i].role === "tool") {
+            const toolMsg = messages[i];
+            if (!validCallIds.has(toolMsg.tool_call_id)) {
+                messages.splice(i, 1);
+            }
+        }
+    }
+    // Pass 3: inject synthetic results for tool_calls missing their tool results
+    for (let i = 0; i < messages.length; i++) {
+        const msg = messages[i];
+        if (msg.role !== "assistant")
+            continue;
+        const asst = msg;
+        if (!asst.tool_calls || asst.tool_calls.length === 0)
+            continue;
+        // Collect tool result IDs that follow this assistant message
+        const resultIds = new Set();
+        for (let j = i + 1; j < messages.length; j++) {
+            const following = messages[j];
+            if (following.role === "tool") {
+                resultIds.add(following.tool_call_id);
+            }
+            else if (TOOL_SCAN_BOUNDARY_ROLES.has(following.role)) {
+                break;
+            }
+        }
+        const missing = asst.tool_calls.filter((tc) => !resultIds.has(tc.id));
+        if (missing.length > 0) {
+            const syntheticResults = missing.map((tc) => ({
+                role: "tool",
+                tool_call_id: tc.id,
+                content: "error: tool call was interrupted (previous turn timed out or was aborted)",
+            }));
+            let insertAt = i + 1;
+            while (insertAt < messages.length && messages[insertAt].role === "tool")
+                insertAt++;
+            messages.splice(insertAt, 0, ...syntheticResults);
+        }
+    }
+}
 // Detect context overflow errors from Azure or MiniMax
 function isContextOverflow(err) {
     if (!(err instanceof Error))
@@ -269,7 +341,7 @@ async function runAgent(messages, callbacks, channel, signal, options) {
     }
     catch { /* unsupported */ }
     const toolPreferences = currentContext?.friend?.toolPreferences;
-    const baseTools = (0, tools_1.getToolsForChannel)(channel ? (0, channel_1.getChannelCapabilities)(channel) : undefined, toolPreferences && Object.keys(toolPreferences).length > 0 ? toolPreferences : undefined);
+    const baseTools = options?.tools ?? (0, tools_1.getToolsForChannel)(channel ? (0, channel_1.getChannelCapabilities)(channel) : undefined, toolPreferences && Object.keys(toolPreferences).length > 0 ? toolPreferences : undefined, currentContext);
     // Rebase provider-owned turn state from canonical messages at user-turn start.
     // This prevents stale provider caches from replaying prior-turn context.
     providerRuntime.resetTurnState(messages);
@@ -435,7 +507,8 @@ async function runAgent(messages, callbacks, channel, signal, options) {
                     let toolResult;
                     let success;
                     try {
-                        toolResult = await (0, tools_1.execTool)(tc.name, args, options?.toolContext);
+                        const execToolFn = options?.execTool ?? tools_1.execTool;
+                        toolResult = await execToolFn(tc.name, args, options?.toolContext);
                         success = true;
                     }
                     catch (e) {

package/dist/heart/daemon/agent-discovery.js

@@ -0,0 +1,81 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listEnabledBundleAgents = listEnabledBundleAgents;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const identity_1 = require("../identity");
+const runtime_1 = require("../../nerves/runtime");
+function listEnabledBundleAgents(options = {}) {
+    const bundlesRoot = options.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)();
+    const readdirSync = options.readdirSync ?? fs.readdirSync;
+    const readFileSync = options.readFileSync ?? fs.readFileSync;
+    let entries;
+    try {
+        entries = readdirSync(bundlesRoot, { withFileTypes: true });
+    }
+    catch {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            component: "daemon",
+            event: "daemon.agent_discovery_failed",
+            message: "failed to read bundle root for daemon agent discovery",
+            meta: { bundlesRoot },
+        });
+        return [];
+    }
+    const discovered = [];
+    for (const entry of entries) {
+        if (!entry.isDirectory() || !entry.name.endsWith(".ouro"))
+            continue;
+        const agentName = entry.name.slice(0, -5);
+        const configPath = path.join(bundlesRoot, entry.name, "agent.json");
+        let enabled = true;
+        try {
+            const raw = readFileSync(configPath, "utf-8");
+            const parsed = JSON.parse(raw);
+            if (typeof parsed.enabled === "boolean") {
+                enabled = parsed.enabled;
+            }
+        }
+        catch {
+            continue;
+        }
+        if (enabled) {
+            discovered.push(agentName);
+        }
+    }
+    return discovered.sort((left, right) => left.localeCompare(right));
+}