@ouro.bot/cli 0.1.0-alpha.152 → 0.1.0-alpha.154

package/dist/heart/tool-description.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.humanReadableToolDescription = humanReadableToolDescription;
+const runtime_1 = require("../nerves/runtime");
+function basename(filePath) {
+    const idx = filePath.lastIndexOf("/");
+    return idx >= 0 ? filePath.slice(idx + 1) : filePath;
+}
+function truncate(text, max) {
+    if (text.length <= max)
+        return text;
+    return text.slice(0, max - 1) + "\u2026";
+}
+const TOOL_DESCRIPTIONS = {
+    shell: (args) => {
+        const cmd = args.command;
+        if (!cmd)
+            return "running a command...";
+        return `running ${truncate(cmd, 50)}...`;
+    },
+    read_file: (args) => {
+        const fp = args.path || args.file_path;
+        if (!fp)
+            return "reading a file...";
+        return `reading ${basename(fp)}...`;
+    },
+    write_file: (args) => {
+        const fp = args.path || args.file_path;
+        if (!fp)
+            return "writing a file...";
+        return `writing ${basename(fp)}...`;
+    },
+    edit_file: (args) => {
+        const fp = args.path || args.file_path;
+        if (!fp)
+            return "editing a file...";
+        return `editing ${basename(fp)}...`;
+    },
+    recall: (args) => {
+        const q = args.query;
+        if (!q)
+            return "searching memory...";
+        return `searching memory for '${truncate(q, 40)}'...`;
+    },
+    grep: (args) => {
+        const p = args.pattern;
+        if (!p)
+            return "searching code...";
+        return `searching code for '${truncate(p, 40)}'...`;
+    },
+    glob: (args) => {
+        const p = args.pattern;
+        if (!p)
+            return "searching for files...";
+        return `searching for ${truncate(p, 40)}...`;
+    },
+    query_session: () => "checking session history...",
+    web_search: () => "searching the web...",
+    coding_spawn: () => "starting coding session...",
+    ponder: () => "thinking deeper...",
+    observe: () => "listening...",
+    diary_write: () => "noting something down...",
+    save_friend_note: () => "making a note...",
+    settle: () => null,
+    rest: () => null,
+};
+function humanReadableToolDescription(name, args) {
+    (0, runtime_1.emitNervesEvent)({
+        component: "engine",
+        event: "engine.tool_description",
+        message: "generated human-readable tool description",
+        meta: { tool: name },
+    });
+    const builder = TOOL_DESCRIPTIONS[name];
+    if (builder)
+        return builder(args);
+    // MCP tools: mcp__server__toolname — extract last segment
+    if (name.startsWith("mcp__")) {
+        const parts = name.split("__");
+        const toolName = parts[parts.length - 1];
+        return `using ${toolName}...`;
+    }
+    return `using ${name}...`;
+}

package/dist/nerves/event-buffer.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createBufferedSink = createBufferedSink;
+const runtime_1 = require("./runtime");
+const DEFAULT_MAX_SIZE = 1000;
+const DEFAULT_TTL_MS = 5 * 60 * 1000; // 5 minutes
+function createBufferedSink(inner, options = {}) {
+    const maxSize = options.maxSize ?? DEFAULT_MAX_SIZE;
+    const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS;
+    const nowMs = options.nowMs ?? (() => Date.now());
+    const buffer = [];
+    let dropped = 0;
+    let sinkHealthy = true;
+    let unhealthySince = null;
+    function tryInner(event) {
+        try {
+            inner(event);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    function markUnhealthy() {
+        sinkHealthy = false;
+        unhealthySince = unhealthySince ?? nowMs();
+    }
+    function markHealthy() {
+        sinkHealthy = true;
+        unhealthySince = null;
+    }
+    function discardBuffer() {
+        const count = buffer.length;
+        dropped += count;
+        buffer.length = 0;
+        (0, runtime_1.emitNervesEvent)({
+            component: "nerves",
+            event: "nerves.buffer_ttl_discard",
+            message: `discarded ${count} buffered events after TTL`,
+            meta: { discarded: count, ttlMs },
+        });
+    }
+    function checkTtl() {
+        if (unhealthySince !== null && nowMs() - unhealthySince > ttlMs) {
+            discardBuffer();
+            // Reset unhealthySince to now so TTL starts fresh for newly buffered events
+            unhealthySince = nowMs();
+            return true;
+        }
+        return false;
+    }
+    function addToBuffer(event) {
+        if (buffer.length >= maxSize) {
+            buffer.shift();
+            dropped++;
+        }
+        buffer.push(event);
+    }
+    function flushBuffer() {
+        while (buffer.length > 0) {
+            const event = buffer[0];
+            if (tryInner(event)) {
+                buffer.shift();
+            }
+            else {
+                markUnhealthy();
+                return;
+            }
+        }
+    }
+    function sink(event) {
+        if (!sinkHealthy) {
+            checkTtl();
+            // Try sending the new event to see if inner has recovered
+            if (tryInner(event)) {
+                markHealthy();
+                flushBuffer();
+            }
+            else {
+                addToBuffer(event);
+            }
+            return;
+        }
+        if (tryInner(event)) {
+            return;
+        }
+        // Inner failed
+        markUnhealthy();
+        addToBuffer(event);
+    }
+    function flush() {
+        if (buffer.length === 0)
+            return;
+        // Test if inner is recovered by trying the first buffered event
+        const first = buffer[0];
+        if (tryInner(first)) {
+            buffer.shift();
+            markHealthy();
+            flushBuffer();
+        }
+        // If still broken, leave buffer intact
+    }
+    function state() {
+        return {
+            buffered: buffer.length,
+            dropped,
+            sinkHealthy,
+        };
+    }
+    return { sink, flush, state };
+}

package/dist/senses/bluebubbles.js

@@ -57,7 +57,7 @@ const channel_1 = require("../mind/friends/channel");
 const pending_1 = require("../mind/pending");
 const prompt_1 = require("../mind/prompt");
 const mcp_manager_1 = require("../repertoire/mcp-manager");
-const phrases_1 = require("../mind/phrases");
+// getPhrases removed — no longer needed after debug-activity cleanup
 const runtime_1 = require("../nerves/runtime");
 const bluebubbles_model_1 = require("./bluebubbles-model");
 const bluebubbles_client_1 = require("./bluebubbles-client");
@@ -65,7 +65,8 @@ const bluebubbles_inbound_log_1 = require("./bluebubbles-inbound-log");
 const bluebubbles_mutation_log_1 = require("./bluebubbles-mutation-log");
 const bluebubbles_runtime_state_1 = require("./bluebubbles-runtime-state");
 const bluebubbles_session_cleanup_1 = require("./bluebubbles-session-cleanup");
-const debug_activity_1 = require("./debug-activity");
+const tool_activity_callbacks_1 = require("../heart/tool-activity-callbacks");
+const commands_1 = require("./commands");
 const trust_gate_1 = require("./trust-gate");
 const pipeline_1 = require("./pipeline");
 const bbFailoverStates = new Map();
@@ -362,63 +363,58 @@ function emitBlueBubblesMarkReadWarning(chat, error) {
 }
 function createBlueBubblesCallbacks(client, chat, replyTarget, isGroupChat) {
     let textBuffer = "";
-    const phrases = (0, phrases_1.getPhrases)();
-    const activity = (0, debug_activity_1.createDebugActivityController)({
-        thinkingPhrases: phrases.thinking,
-        followupPhrases: phrases.followup,
-        startTypingOnModelStart: !isGroupChat,
-        startTypingOnFirstTextChunk: isGroupChat,
-        suppressInitialModelStatus: true,
-        suppressFollowupPhraseStatus: true,
-        transport: {
-            sendStatus: async (text) => {
-                const sent = await client.sendText({
-                    chat,
-                    text,
-                    replyToMessageGuid: replyTarget.getReplyToMessageGuid(),
-                });
-                return sent.messageGuid;
-            },
-            editStatus: async (_messageGuid, text) => {
-                await client.sendText({
-                    chat,
-                    text,
-                    replyToMessageGuid: replyTarget.getReplyToMessageGuid(),
-                });
-            },
-            setTyping: async (active) => {
-                if (!active) {
-                    await client.setTyping(chat, false);
-                    return;
-                }
-                const [markReadResult, typingResult] = await Promise.allSettled([
-                    client.markChatRead(chat),
-                    client.setTyping(chat, true),
-                ]);
-                if (markReadResult.status === "rejected") {
-                    emitBlueBubblesMarkReadWarning(chat, markReadResult.reason);
-                }
-                if (typingResult.status === "rejected") {
-                    throw typingResult.reason;
-                }
-            },
-        },
-        onTransportError: (operation, error) => {
+    let typingActive = false;
+    let queue = Promise.resolve();
+    function enqueue(operation, task) {
+        queue = queue.then(task).catch((error) => {
             (0, runtime_1.emitNervesEvent)({
                 level: "warn",
                 component: "senses",
                 event: "senses.bluebubbles_activity_error",
                 message: "bluebubbles activity transport failed",
-                meta: {
-                    operation,
-                    reason: error instanceof Error ? error.message : String(error),
-                },
+                meta: { operation, reason: error instanceof Error ? error.message : String(error) },
             });
-        },
+        });
+    }
+    function startTypingNow() {
+        /* v8 ignore next -- defensive guard: callers already check typingActive @preserve */
+        if (typingActive)
+            return;
+        typingActive = true;
+        enqueue("typing_start", async () => {
+            const [markReadResult, typingResult] = await Promise.allSettled([
+                client.markChatRead(chat),
+                client.setTyping(chat, true),
+            ]);
+            if (markReadResult.status === "rejected") {
+                emitBlueBubblesMarkReadWarning(chat, markReadResult.reason);
+            }
+            if (typingResult.status === "rejected") {
+                throw typingResult.reason;
+            }
+        });
+    }
+    function sendStatus(text) {
+        enqueue("send_status", async () => {
+            await client.sendText({
+                chat,
+                text,
+                replyToMessageGuid: replyTarget.getReplyToMessageGuid(),
+            });
+        });
+    }
+    const toolCallbacks = (0, tool_activity_callbacks_1.createToolActivityCallbacks)({
+        onDescription: (text) => sendStatus(text),
+        /* v8 ignore next -- onResult only called in debug mode; tested via tool-activity-callbacks.test.ts @preserve */
+        onResult: (text) => sendStatus(text),
+        /* v8 ignore next -- onFailure only called on tool failure; tested via tool-activity-callbacks.test.ts @preserve */
+        onFailure: (text) => sendStatus(`\u2717 ${text}`),
+        isDebug: (0, commands_1.getDebugMode)(),
     });
     return {
         onModelStart() {
-            activity.onModelStart();
+            if (!isGroupChat)
+                startTypingNow();
             (0, runtime_1.emitNervesEvent)({
                 component: "senses",
                 event: "senses.bluebubbles_turn_start",
@@ -435,12 +431,16 @@ function createBlueBubblesCallbacks(client, chat, replyTarget, isGroupChat) {
             });
         },
         onTextChunk(text) {
-            activity.onTextChunk(text);
+            if (isGroupChat && !typingActive)
+                startTypingNow();
             textBuffer += text;
         },
         onReasoningChunk(_text) { },
         onToolStart(name, _args) {
-            activity.onToolStart(name, _args);
+            // Tool activity is a reply commitment — start typing if not already
+            if (!typingActive)
+                startTypingNow();
+            toolCallbacks.onToolStart(name, _args);
             (0, runtime_1.emitNervesEvent)({
                 component: "senses",
                 event: "senses.bluebubbles_tool_start",
@@ -449,7 +449,7 @@ function createBlueBubblesCallbacks(client, chat, replyTarget, isGroupChat) {
             });
         },
         onToolEnd(name, summary, success) {
-            activity.onToolEnd(name, summary, success);
+            toolCallbacks.onToolEnd(name, summary, success);
             (0, runtime_1.emitNervesEvent)({
                 component: "senses",
                 event: "senses.bluebubbles_tool_end",
@@ -458,7 +458,7 @@ function createBlueBubblesCallbacks(client, chat, replyTarget, isGroupChat) {
             });
         },
         onError(error, severity) {
-            activity.onError(error);
+            sendStatus(`\u2717 ${error.message}`);
             (0, runtime_1.emitNervesEvent)({
                 level: severity === "terminal" ? "error" : "warn",
                 component: "senses",
@@ -471,14 +471,23 @@ function createBlueBubblesCallbacks(client, chat, replyTarget, isGroupChat) {
             textBuffer = "";
         },
         async flush() {
-            await activity.drain();
+            await queue;
             const trimmed = textBuffer.trim();
             if (!trimmed) {
-                await activity.finish();
+                if (typingActive) {
+                    typingActive = false;
+                    enqueue("typing_stop", async () => { await client.setTyping(chat, false); });
+                    await queue;
+                }
                 return;
             }
             textBuffer = "";
-            await activity.finish();
+            /* v8 ignore next 4 -- branch: typing may already be stopped before flush @preserve */
+            if (typingActive) {
+                typingActive = false;
+                enqueue("typing_stop", async () => { await client.setTyping(chat, false); });
+                await queue;
+            }
             await client.sendText({
                 chat,
                 text: trimmed,
@@ -486,7 +495,13 @@ function createBlueBubblesCallbacks(client, chat, replyTarget, isGroupChat) {
             });
         },
         async finish() {
-            await activity.finish();
+            if (!typingActive) {
+                await queue;
+                return;
+            }
+            typingActive = false;
+            enqueue("typing_stop", async () => { await client.setTyping(chat, false); });
+            await queue;
         },
     };
 }

package/dist/senses/cli.js

@@ -660,28 +660,30 @@ async function runCliSession(options) {
                     continue;
                 }
             }
-            // Check for slash commands
-            const parsed = (0, commands_1.parseSlashCommand)(input);
-            if (parsed) {
-                const dispatchResult = registry.dispatch(parsed.command, { channel: "cli" });
-                if (dispatchResult.handled && dispatchResult.result) {
-                    if (dispatchResult.result.action === "exit") {
-                        break;
-                    }
-                    else if (dispatchResult.result.action === "new") {
-                        messages.length = 0;
-                        messages.push({ role: "system", content: await (0, prompt_1.buildSystem)("cli") });
-                        await options.onNewSession?.();
-                        // eslint-disable-next-line no-console -- terminal UX: session cleared
-                        console.log("session cleared");
-                        process.stdout.write(CLI_PROMPT);
-                        continue;
-                    }
-                    else if (dispatchResult.result.action === "response") {
-                        // eslint-disable-next-line no-console -- terminal UX: command dispatch result
-                        console.log(dispatchResult.result.message || "");
-                        process.stdout.write(CLI_PROMPT);
-                        continue;
+            // Check for slash commands (legacy path only — pipeline handles commands for runTurn path)
+            if (!options.runTurn) {
+                const parsed = (0, commands_1.parseSlashCommand)(input);
+                if (parsed) {
+                    const dispatchResult = registry.dispatch(parsed.command, { channel: "cli" });
+                    if (dispatchResult.handled && dispatchResult.result) {
+                        if (dispatchResult.result.action === "exit") {
+                            break;
+                        }
+                        else if (dispatchResult.result.action === "new") {
+                            messages.length = 0;
+                            messages.push({ role: "system", content: await (0, prompt_1.buildSystem)("cli") });
+                            await options.onNewSession?.();
+                            // eslint-disable-next-line no-console -- terminal UX: session cleared
+                            console.log("session cleared");
+                            process.stdout.write(CLI_PROMPT);
+                            continue;
+                        }
+                        else if (dispatchResult.result.action === "response") {
+                            // eslint-disable-next-line no-console -- terminal UX: command dispatch result
+                            console.log(dispatchResult.result.message || "");
+                            process.stdout.write(CLI_PROMPT);
+                            continue;
+                        }
                     }
                 }
             }
@@ -696,7 +698,27 @@ async function runCliSession(options) {
                 if (options.runTurn) {
                     // Pipeline-based turn: the runTurn callback handles user message assembly,
                     // pending drain, trust gate, runAgent, postTurn, and token accumulation.
+                    // Commands (e.g. /debug, /exit, /new) are intercepted in the pipeline.
                     result = await options.runTurn(messages, input, cliCallbacks, currentAbort.signal, effectiveToolContext);
+                    // Handle pipeline-intercepted commands with loop-control side effects
+                    if (result?.turnOutcome === "command") {
+                        if (result.commandAction === "exit") {
+                            break;
+                        }
+                        else if (result.commandAction === "new") {
+                            messages.length = 0;
+                            messages.push({ role: "system", content: await (0, prompt_1.buildSystem)("cli") });
+                            await options.onNewSession?.();
+                            // eslint-disable-next-line no-console -- terminal UX: session cleared
+                            console.log("session cleared");
+                            process.stdout.write(CLI_PROMPT);
+                            continue;
+                        }
+                        // For "response" commands: the pipeline already emitted the response via onTextChunk
+                        cliCallbacks.flushMarkdown();
+                        process.stdout.write(CLI_PROMPT);
+                        continue;
+                    }
                 }
                 else {
                     // Legacy path: inline runAgent (used by adoption specialist and tests)
@@ -898,7 +920,7 @@ async function main(agentName, options) {
                         process.stdout.write(`${result.gateResult.autoReply}\n`);
                     }
                 }
-                return { usage: result.usage };
+                return { usage: result.usage, turnOutcome: result.turnOutcome, commandAction: result.commandAction };
             },
             onNewSession: () => {
                 (0, context_1.deleteSession)(sessPath);

package/dist/senses/commands.js

@@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCommandRegistry = createCommandRegistry;
 exports.getToolChoiceRequired = getToolChoiceRequired;
 exports.resetToolChoiceRequired = resetToolChoiceRequired;
+exports.getDebugMode = getDebugMode;
+exports.resetDebugMode = resetDebugMode;
 exports.registerDefaultCommands = registerDefaultCommands;
+exports.getSharedCommandRegistry = getSharedCommandRegistry;
+exports.resetSharedCommandRegistry = resetSharedCommandRegistry;
 exports.parseSlashCommand = parseSlashCommand;
 const identity_1 = require("../heart/identity");
 const runtime_1 = require("../nerves/runtime");
@@ -35,6 +39,14 @@ function getToolChoiceRequired() {
 function resetToolChoiceRequired() {
     _toolChoiceRequired = false;
 }
+// Module-level toggle for debug mode
+let _debugMode = false;
+function getDebugMode() {
+    return _debugMode;
+}
+function resetDebugMode() {
+    _debugMode = false;
+}
 function registerDefaultCommands(registry) {
     (0, runtime_1.emitNervesEvent)({
         event: "repertoire.load_start",
@@ -73,6 +85,15 @@ function registerDefaultCommands(registry) {
             return { action: "response", message: `tool-required mode: ${_toolChoiceRequired ? "ON" : "OFF"}` };
         },
     });
+    registry.register({
+        name: "debug",
+        description: "toggle debug mode (verbose tool output)",
+        channels: ["cli", "teams", "bluebubbles"],
+        handler: () => {
+            _debugMode = !_debugMode;
+            return { action: "response", message: `debug mode: ${_debugMode ? "ON" : "OFF"}` };
+        },
+    });
     (0, runtime_1.emitNervesEvent)({
         event: "repertoire.load_end",
         component: "repertoire",
@@ -80,6 +101,17 @@ function registerDefaultCommands(registry) {
         meta: {},
     });
 }
+let _sharedRegistry = null;
+function getSharedCommandRegistry() {
+    if (!_sharedRegistry) {
+        _sharedRegistry = createCommandRegistry();
+        registerDefaultCommands(_sharedRegistry);
+    }
+    return _sharedRegistry;
+}
+function resetSharedCommandRegistry() {
+    _sharedRegistry = null;
+}
 function parseSlashCommand(input) {
     const trimmed = input.trim();
     if (!trimmed.startsWith("/"))

package/dist/senses/inner-dialog.js

@@ -71,6 +71,7 @@ const contextual_heartbeat_1 = require("./contextual-heartbeat");
 const journal_index_1 = require("../mind/journal-index");
 const habit_parser_1 = require("../heart/daemon/habit-parser");
 const cadence_1 = require("../heart/daemon/cadence");
+const daemon_health_1 = require("../heart/daemon/daemon-health");
 const DEFAULT_INNER_DIALOG_INSTINCTS = [
     {
         id: "heartbeat_checkin",
@@ -647,6 +648,17 @@ async function runInnerDialogTurn(options) {
                     // Habit file not found
                     userContent = `habit "${habitName}" could not be read (file not found or unreadable). check habits/${habitName}.md exists.`;
                 }
+                // Degraded state nudge (best-effort: never crash on health file read failure)
+                try {
+                    const health = (0, daemon_health_1.readHealth)((0, daemon_health_1.getDefaultHealthPath)());
+                    if (health && health.degraded.length > 0) {
+                        const reasons = health.degraded.map((d) => `${d.component}: ${d.reason}`).join("; ");
+                        userContent = `${userContent}\n\n[note: my scheduling is degraded: ${reasons}]`;
+                    }
+                }
+                catch {
+                    // Best-effort: missing file or parse error -> no nudge, no crash
+                }
             }
             else {
                 userContent = buildInstinctUserMessage(instincts, reason, state);

package/dist/senses/pipeline.js

@@ -7,6 +7,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleInboundTurn = handleInboundTurn;
 const runtime_1 = require("../nerves/runtime");
+const commands_1 = require("./commands");
 const continuity_1 = require("./continuity");
 const manager_1 = require("../heart/bridges/manager");
 const identity_1 = require("../heart/identity");
@@ -167,6 +168,41 @@ async function handleInboundTurn(input) {
             // Switch failed OR succeeded — either way, fall through to normal processing.
         }
     }
+    // Step 0b: Slash command interception (before friend resolution / agent turn)
+    {
+        const firstUserMsg = input.messages.find((m) => m.role === "user");
+        const userText = firstUserMsg
+            ? (typeof firstUserMsg.content === "string"
+                ? firstUserMsg.content
+                : Array.isArray(firstUserMsg.content)
+                    ? firstUserMsg.content.find((p) => p.type === "text")?.text ?? ""
+                    : /* v8 ignore next -- defensive: content is always string or array @preserve */ "")
+            : "";
+        const parsed = (0, commands_1.parseSlashCommand)(userText);
+        if (parsed) {
+            const registry = (0, commands_1.getSharedCommandRegistry)();
+            const dispatchResult = registry.dispatch(parsed.command, { channel: input.channel });
+            if (dispatchResult.handled && dispatchResult.result) {
+                (0, runtime_1.emitNervesEvent)({
+                    component: "senses",
+                    event: "senses.pipeline_command",
+                    message: `slash command intercepted: /${parsed.command}`,
+                    meta: { command: parsed.command, channel: input.channel },
+                });
+                if (dispatchResult.result.message) {
+                    input.callbacks.onTextChunk(dispatchResult.result.message);
+                }
+                // Return a minimal result — no agent turn, no session write
+                const resolvedContext = await input.friendResolver.resolve();
+                return {
+                    resolvedContext,
+                    gateResult: { allowed: true },
+                    turnOutcome: "command",
+                    commandAction: dispatchResult.result.action,
+                };
+            }
+        }
+    }
     // Step 1: Resolve friend
     const resolvedContext = await input.friendResolver.resolve();
     (0, runtime_1.emitNervesEvent)({