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

package/dist/senses/teams.js

@@ -70,6 +70,8 @@ const turn_coordinator_1 = require("../heart/turn-coordinator");
 const identity_1 = require("../heart/identity");
 const mcp_manager_1 = require("../repertoire/mcp-manager");
 const progress_story_1 = require("../heart/progress-story");
+const tool_activity_callbacks_1 = require("../heart/tool-activity-callbacks");
+const commands_2 = require("./commands");
 const http = __importStar(require("http"));
 const path = __importStar(require("path"));
 const trust_gate_1 = require("./trust-gate");
@@ -425,35 +427,37 @@ function createTeamsCallbacks(stream, controller, sendMessage, options) {
         onClearText: () => {
             textBuffer = "";
         },
-        onToolStart: (name, args) => {
-            stopPhraseRotation();
-            // Force-flush any accumulated text, bypassing MIN_INITIAL_CHARS threshold
-            firstContentEmitted = true;
-            flushTextBuffer();
-            // Emit a placeholder to satisfy the 15s Copilot timeout for initial
-            // stream.emit(). Without this, long tool chains (e.g. ADO batch ops)
-            // never emit before the timeout and the user sees "this response was
-            // stopped". The placeholder is replaced by actual content on next emit.
-            // https://learn.microsoft.com/en-us/answers/questions/2288017/m365-custom-engine-agents-timeout-message-after-15
-            if (!streamHasContent)
-                safeEmit("⏳");
-            const argSummary = (0, tools_1.summarizeArgs)(name, args) || Object.keys(args).join(", ");
-            safeUpdate((0, progress_story_1.renderProgressStory)((0, progress_story_1.buildProgressStory)({
-                scope: "shared-work",
-                phase: "processing",
-                objective: `running ${name} (${argSummary})...`,
-            })));
-            hadToolRun = true;
-        },
-        onToolEnd: (name, summary, success) => {
-            stopPhraseRotation();
-            const msg = (0, format_1.formatToolResult)(name, summary, success);
-            safeUpdate((0, progress_story_1.renderProgressStory)((0, progress_story_1.buildProgressStory)({
-                scope: "shared-work",
-                phase: "processing",
-                objective: msg,
-            })));
-        },
+        ...(() => {
+            const toolCbs = (0, tool_activity_callbacks_1.createToolActivityCallbacks)({
+                onDescription: (text) => safeUpdate(text),
+                /* v8 ignore next -- onResult only called in debug mode; tested via tool-activity-callbacks.test.ts @preserve */
+                onResult: (text) => safeUpdate(text),
+                /* v8 ignore next -- onFailure tested via onToolEnd failure test @preserve */
+                onFailure: (text) => safeUpdate(`\u2717 ${text}`),
+                isDebug: (0, commands_2.getDebugMode)(),
+            });
+            return {
+                onToolStart: (name, args) => {
+                    stopPhraseRotation();
+                    // Force-flush any accumulated text, bypassing MIN_INITIAL_CHARS threshold
+                    firstContentEmitted = true;
+                    flushTextBuffer();
+                    // Emit a placeholder to satisfy the 15s Copilot timeout for initial
+                    // stream.emit(). Without this, long tool chains (e.g. ADO batch ops)
+                    // never emit before the timeout and the user sees "this response was
+                    // stopped". The placeholder is replaced by actual content on next emit.
+                    // https://learn.microsoft.com/en-us/answers/questions/2288017/m365-custom-engine-agents-timeout-message-after-15
+                    if (!streamHasContent)
+                        safeEmit("\u23f3");
+                    toolCbs.onToolStart(name, args);
+                    hadToolRun = true;
+                },
+                onToolEnd: (name, summary, success) => {
+                    stopPhraseRotation();
+                    toolCbs.onToolEnd(name, summary, success);
+                },
+            };
+        })(),
         onKick: () => {
             stopPhraseRotation();
             const msg = (0, format_1.formatKick)();
@@ -568,6 +572,7 @@ function createTeamsCommandRegistry() {
     (0, commands_1.registerDefaultCommands)(registry);
     return registry;
 }
+/* v8 ignore start -- superseding follow-up slash command handler; tested via startTeamsApp integration tests @preserve */
 function handleTeamsSlashCommand(text, registry, friendId, conversationId, stream, emitResponse = true) {
     const parsed = (0, commands_1.parseSlashCommand)(text);
     if (!parsed)
@@ -591,6 +596,7 @@ function handleTeamsSlashCommand(text, registry, friendId, conversationId, strea
     }
     return null;
 }
+/* v8 ignore stop */
 // Handle an incoming Teams message
 async function handleTeamsMessage(text, stream, conversationId, teamsContext, sendMessage, reactionOverrides) {
     const turnKey = teamsTurnKey(conversationId);
@@ -619,11 +625,6 @@ async function handleTeamsMessage(text, stream, conversationId, teamsContext, se
     // Pre-resolve friend for session path + slash commands (pipeline will re-use the cached result)
     const resolvedContext = await resolver.resolve();
     const friendId = resolvedContext.friend.id;
-    const registry = createTeamsCommandRegistry();
-    // Check for slash commands (before pipeline -- these are transport-level concerns)
-    if (handleTeamsSlashCommand(text, registry, friendId, conversationId, stream)) {
-        return;
-    }
     // ── Teams adapter concerns: controller, callbacks, session path ──────────
     const controller = new AbortController();
     const channelConfig = (0, config_2.getTeamsChannelConfig)();
@@ -729,6 +730,16 @@ async function handleTeamsMessage(text, stream, conversationId, teamsContext, se
             runAgentOptions: agentOptions,
             failoverState: teamsFailoverState,
         });
+        // ── Handle pipeline-intercepted commands ────────────────────────
+        if (result.turnOutcome === "command") {
+            if (result.commandAction === "new") {
+                (0, context_1.deleteSession)(sessPath);
+                stream.emit("session cleared");
+            }
+            // For "response" commands: pipeline already emitted the response via onTextChunk
+            await callbacks.flush();
+            return;
+        }
         /* v8 ignore start -- failover display: tested via pipeline integration tests @preserve */
         if (result.failoverMessage) {
             stream.emit(result.failoverMessage);
@@ -776,7 +787,7 @@ async function handleTeamsMessage(text, stream, conversationId, teamsContext, se
             currentText = replayTail;
             continue;
         }
-        if (handleTeamsSlashCommand(supersedingFollowUp.text, registry, friendId, conversationId, stream, false)) {
+        if (handleTeamsSlashCommand(supersedingFollowUp.text, createTeamsCommandRegistry(), friendId, conversationId, stream, false)) {
             return;
         }
         currentText = supersedingFollowUp.text;

package/package.json

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

package/dist/senses/debug-activity.js

@@ -1,154 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDebugActivityController = createDebugActivityController;
-const format_1 = require("../mind/format");
-const phrases_1 = require("../mind/phrases");
-const runtime_1 = require("../nerves/runtime");
-const progress_story_1 = require("../heart/progress-story");
-function createDebugActivityController(options) {
-    let queue = Promise.resolve();
-    let statusMessageGuid;
-    let typingActive = false;
-    let hadToolRun = false;
-    let followupShown = false;
-    let lastPhrase = "";
-    function reportTransportError(operation, error) {
-        (0, runtime_1.emitNervesEvent)({
-            level: "warn",
-            component: "senses",
-            event: "senses.debug_activity_transport_error",
-            message: "debug activity transport failed",
-            meta: {
-                operation,
-                reason: error instanceof Error ? error.message : String(error),
-            },
-        });
-        options.onTransportError?.(operation, error);
-    }
-    function enqueue(operation, task) {
-        queue = queue
-            .then(task)
-            .catch((error) => {
-            reportTransportError(operation, error);
-        });
-    }
-    function nextPhrase(pool) {
-        const phrase = (0, phrases_1.pickPhrase)(pool, lastPhrase);
-        lastPhrase = phrase;
-        return phrase;
-    }
-    function startTypingNow() {
-        if (typingActive) {
-            return;
-        }
-        typingActive = true;
-        enqueue("typing_start", async () => {
-            await options.transport.setTyping(true);
-        });
-    }
-    function setStatus(text) {
-        (0, runtime_1.emitNervesEvent)({
-            component: "senses",
-            event: "senses.debug_activity_update",
-            message: "debug activity status updated",
-            meta: {
-                hasStatusGuid: Boolean(statusMessageGuid),
-                textLength: text.length,
-            },
-        });
-        const shouldStartTyping = !typingActive;
-        if (shouldStartTyping) {
-            typingActive = true;
-        }
-        enqueue("status_update", async () => {
-            if (statusMessageGuid) {
-                await options.transport.editStatus(statusMessageGuid, text);
-            }
-            else {
-                statusMessageGuid = await options.transport.sendStatus(text);
-            }
-            if (shouldStartTyping) {
-                await options.transport.setTyping(true);
-            }
-        });
-    }
-    return {
-        onModelStart() {
-            const pool = hadToolRun ? options.followupPhrases : options.thinkingPhrases;
-            if (options.startTypingOnModelStart) {
-                startTypingNow();
-            }
-            if (options.suppressInitialModelStatus && !statusMessageGuid && !hadToolRun) {
-                nextPhrase(pool);
-                return;
-            }
-            setStatus((0, progress_story_1.renderProgressStory)((0, progress_story_1.buildProgressStory)({
-                scope: "shared-work",
-                phase: "processing",
-                objective: `${nextPhrase(pool)}...`,
-            })));
-        },
-        onToolStart(name, args) {
-            hadToolRun = true;
-            followupShown = false;
-            const argSummary = Object.values(args).join(", ");
-            const detail = argSummary ? ` (${argSummary})` : "";
-            setStatus((0, progress_story_1.renderProgressStory)((0, progress_story_1.buildProgressStory)({
-                scope: "shared-work",
-                phase: "processing",
-                objective: `running ${name}${detail}...`,
-            })));
-        },
-        onToolEnd(name, summary, success) {
-            hadToolRun = true;
-            followupShown = false;
-            setStatus((0, progress_story_1.renderProgressStory)((0, progress_story_1.buildProgressStory)({
-                scope: "shared-work",
-                phase: "processing",
-                objective: (0, format_1.formatToolResult)(name, summary, success),
-            })));
-        },
-        onTextChunk(text) {
-            if (!text) {
-                return;
-            }
-            if (!hadToolRun && options.startTypingOnFirstTextChunk) {
-                startTypingNow();
-            }
-            if (!hadToolRun || followupShown) {
-                return;
-            }
-            followupShown = true;
-            if (options.suppressFollowupPhraseStatus) {
-                return;
-            }
-            setStatus((0, progress_story_1.renderProgressStory)((0, progress_story_1.buildProgressStory)({
-                scope: "shared-work",
-                phase: "processing",
-                objective: `${nextPhrase(options.followupPhrases)}...`,
-            })));
-        },
-        onError(error) {
-            setStatus((0, progress_story_1.renderProgressStory)((0, progress_story_1.buildProgressStory)({
-                scope: "shared-work",
-                phase: "errored",
-                outcomeText: (0, format_1.formatError)(error),
-            })));
-            this.finish();
-        },
-        async drain() {
-            await queue;
-        },
-        async finish() {
-            if (!typingActive) {
-                await queue;
-                return;
-            }
-            typingActive = false;
-            enqueue("typing_stop", async () => {
-                await options.transport.setTyping(false);
-            });
-            await queue;
-        },
-    };
-}