@ouro.bot/cli 0.1.0-alpha.73 → 0.1.0-alpha.731

package/dist/repertoire/tools.js

@@ -1,18 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.noResponseTool = exports.finalAnswerTool = exports.tools = void 0;
+exports.surfaceToolDef = exports.speakTool = exports.restTool = exports.ponderTool = exports.observeTool = exports.settleTool = exports.tools = void 0;
+exports.resetMcpDefinitions = resetMcpDefinitions;
 exports.getToolsForChannel = getToolsForChannel;
-exports.isConfirmationRequired = isConfirmationRequired;
+exports.resolveToolDefinition = resolveToolDefinition;
+exports.approvalPolicyForToolName = approvalPolicyForToolName;
+exports.shellRiskProfile = shellRiskProfile;
+exports.riskProfileForTool = riskProfileForTool;
+exports.riskProfileForToolName = riskProfileForToolName;
 exports.execTool = execTool;
 exports.summarizeArgs = summarizeArgs;
+exports.buildToolResultSummary = buildToolResultSummary;
 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 tools_bundle_1 = require("./tools-bundle");
 const runtime_1 = require("../nerves/runtime");
 const guardrails_1 = require("./guardrails");
 const identity_1 = require("../heart/identity");
+const store_1 = require("../commerce/store");
+const tools_surface_1 = require("./tools-surface");
+const mcp_tools_1 = require("./mcp-tools");
+const tools_voice_1 = require("./tools-voice");
+const shell_sessions_1 = require("./shell-sessions");
 function safeGetAgentRoot() {
     try {
         return (0, identity_1.getAgentRoot)();
@@ -24,10 +36,24 @@ function safeGetAgentRoot() {
 // Re-export types and constants used by the rest of the codebase
 var tools_base_2 = require("./tools-base");
 Object.defineProperty(exports, "tools", { enumerable: true, get: function () { return tools_base_2.tools; } });
-Object.defineProperty(exports, "finalAnswerTool", { enumerable: true, get: function () { return tools_base_2.finalAnswerTool; } });
-Object.defineProperty(exports, "noResponseTool", { enumerable: true, get: function () { return tools_base_2.noResponseTool; } });
+Object.defineProperty(exports, "settleTool", { enumerable: true, get: function () { return tools_base_2.settleTool; } });
+Object.defineProperty(exports, "observeTool", { enumerable: true, get: function () { return tools_base_2.observeTool; } });
+Object.defineProperty(exports, "ponderTool", { enumerable: true, get: function () { return tools_base_2.ponderTool; } });
+Object.defineProperty(exports, "restTool", { enumerable: true, get: function () { return tools_base_2.restTool; } });
+Object.defineProperty(exports, "speakTool", { enumerable: true, get: function () { return tools_base_2.speakTool; } });
+// Re-export surface tool schema for consumers (e.g. heart/core.ts)
+var tools_surface_2 = require("./tools-surface");
+Object.defineProperty(exports, "surfaceToolDef", { enumerable: true, get: function () { return tools_surface_2.surfaceToolDef; } });
 // All tool definitions in a single registry
-const allDefinitions = [...tools_base_1.baseToolDefinitions, ...tools_bluebubbles_1.bluebubblesToolDefinitions, ...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, ...tools_bundle_1.bundleToolDefinitions, ...tools_voice_1.voiceToolDefinitions, tools_surface_1.surfaceToolDefinition];
+const COMMERCE_AUTHORITY_TOOLS = new Set(["stripe_create_card", "flight_hold", "flight_book"]);
+// MCP tool definitions — populated each time getToolsForChannel() is called with an mcpManager.
+// Kept separate from allDefinitions so execTool can find them.
+let mcpDefinitions = [];
+/** Exported for testing — reset the MCP definitions cache. */
+function resetMcpDefinitions() {
+    mcpDefinitions = [];
+}
 function baseToolsForCapabilities() {
     // Use baseToolDefinitions at call time so dynamically-added tools are included
     return tools_base_1.baseToolDefinitions.map((d) => d.tool);
@@ -58,14 +84,17 @@ function filterByCapability(toolList, providerCapabilities) {
 // Teams/integration tools are included only if their integration is in availableIntegrations.
 // When toolPreferences is provided, matching preferences are appended to tool descriptions.
 // When providerCapabilities is provided, tools with requiredCapability are filtered.
-function getToolsForChannel(capabilities, toolPreferences, _context, providerCapabilities) {
+function getToolsForChannel(capabilities, toolPreferences, _context, providerCapabilities, mcpManager, _chatModel) {
     const baseTools = baseToolsForCapabilities();
     const bluebubblesTools = capabilities?.channel === "bluebubbles"
         ? tools_bluebubbles_1.bluebubblesToolDefinitions.map((d) => d.tool)
         : [];
+    const voiceTools = capabilities?.channel === "voice"
+        ? tools_voice_1.voiceToolDefinitions.map((d) => d.tool)
+        : [];
     let result;
     if (!capabilities || capabilities.availableIntegrations.length === 0) {
-        result = [...baseTools, ...bluebubblesTools];
+        result = [...baseTools, ...bluebubblesTools, ...voiceTools];
     }
     else {
         const available = new Set(capabilities.availableIntegrations);
@@ -73,7 +102,7 @@ function getToolsForChannel(capabilities, toolPreferences, _context, providerCap
         // 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) {
-            result = [...baseTools, ...bluebubblesTools, ...integrationDefs.map((d) => d.tool)];
+            result = [...baseTools, ...bluebubblesTools, ...voiceTools, ...integrationDefs.map((d) => d.tool)];
         }
         else {
             // Build a map of integration -> preference text for fast lookup
@@ -87,16 +116,119 @@ function getToolsForChannel(capabilities, toolPreferences, _context, providerCap
                 const pref = prefMap.get(d.integration);
                 return pref ? applyPreference(d.tool, pref) : d.tool;
             });
-            result = [...baseTools, ...bluebubblesTools, ...enrichedIntegrationTools];
+            result = [...baseTools, ...bluebubblesTools, ...voiceTools, ...enrichedIntegrationTools];
         }
     }
+    // Append first-class MCP tools when mcpManager is provided
+    if (mcpManager) {
+        mcpDefinitions = (0, mcp_tools_1.mcpToolsAsDefinitions)(mcpManager);
+        const mcpSchemas = mcpDefinitions.map((d) => d.tool);
+        result = [...result, ...mcpSchemas];
+    }
     return filterByCapability(result, providerCapabilities);
 }
-// Check whether a tool requires user confirmation before execution.
-// Reads from ToolDefinition.confirmationRequired instead of a separate Set.
-function isConfirmationRequired(toolName) {
-    const def = allDefinitions.find((d) => d.tool.function.name === toolName);
-    return def?.confirmationRequired === true;
+// Look up a tool definition from the live combined registry (native + MCP).
+// The base registry is intentionally consulted at call time so tests and
+// runtime extensions cannot leave execution metadata behind a stale snapshot.
+function resolveToolDefinition(toolName) {
+    return tools_base_1.baseToolDefinitions.find((d) => d.tool.function.name === toolName)
+        ?? allDefinitions.find((d) => d.tool.function.name === toolName)
+        ?? mcpDefinitions.find((d) => d.tool.function.name === toolName);
+}
+function approvalPolicyForToolName(name, args) {
+    return resolveToolDefinition(name)?.approvalPolicy?.(args) ?? { kind: "not_required" };
+}
+const findDefinition = resolveToolDefinition;
+function normalizeGuardArgs(_name, args) {
+    return args;
+}
+const READ_ONLY_OURO_SHELL_COMMANDS = new Set([
+    "help",
+    "-h",
+    "--help",
+    "-v",
+    "--version",
+    "status",
+    "whoami",
+    "versions",
+    "changelog",
+    "mailbox",
+    "inner",
+    "thoughts",
+    "check",
+    "session list",
+    "mcp list",
+    "config models",
+    "auth verify",
+    "vault status",
+    "vault config status",
+    "vault item status",
+    "vault item list",
+]);
+function shellTokens(command) {
+    return command.trim().split(/\s+/).filter(Boolean);
+}
+function ouroShellRiskReason(command) {
+    const tokens = shellTokens(command);
+    if (tokens[0] !== "ouro")
+        return null;
+    const first = tokens[1] ?? "";
+    const second = tokens[2] ?? "";
+    const third = tokens[3] ?? "";
+    const twoWord = second ? `${first} ${second}` : first;
+    const threeWord = third ? `${twoWord} ${third}` : twoWord;
+    if (READ_ONLY_OURO_SHELL_COMMANDS.has(threeWord)
+        || READ_ONLY_OURO_SHELL_COMMANDS.has(twoWord)
+        || READ_ONLY_OURO_SHELL_COMMANDS.has(first)) {
+        return null;
+    }
+    const hint = first === "restart_runtime"
+        ? " Hint: use the restart_runtime tool instead of shell."
+        : "";
+    return `ouro CLI command may mutate runtime/config state or be unavailable from shell.${hint}`;
+}
+function shellRiskProfile(args) {
+    const command = String(args.command);
+    const destructive = (0, shell_sessions_1.detectDestructivePatterns)(command);
+    if (destructive.length > 0) {
+        return { mutates: "external_side_effect", risk: "high", reason: `destructive shell pattern: ${destructive.join(", ")}` };
+    }
+    const ouroRiskReason = ouroShellRiskReason(command);
+    if (ouroRiskReason) {
+        return { mutates: "external_side_effect", risk: "high", reason: ouroRiskReason };
+    }
+    if (/(^|\s)(rm|mv|cp|touch|mkdir|rmdir)\b/.test(command)
+        || /(^|\s)(npm|pnpm|yarn)\s+(install|add|remove|update|upgrade)\b/.test(command)
+        || /(^|\s)git\s+(add|apply|checkout|clean|commit|merge|pull|push|rebase|reset|restore|switch)\b/.test(command)
+        || /(^|\s)(sed\s+-i|perl\s+-pi)\b/.test(command)
+        || /(^|\s)(tee|truncate)\b/.test(command)
+        || /(^|[^<])>>?\s*\S+/.test(command)) {
+        return { mutates: "external_side_effect", risk: "high", reason: "shell command appears to mutate files, packages, git state, or external state" };
+    }
+    return { mutates: "none", risk: "low" };
+}
+function riskProfileForTool(def, name, args) {
+    if (name === "shell")
+        return shellRiskProfile(args);
+    if (typeof def.riskProfile === "function")
+        return def.riskProfile(args);
+    return def.riskProfile ?? { mutates: "none", risk: "low" };
+}
+function riskProfileForToolName(name, args) {
+    const def = findDefinition(name);
+    return def ? riskProfileForTool(def, name, args) : null;
+}
+function orientationHoldMessage(name, profile, reason) {
+    return `orientation hold: ${reason} Available: orientation_get plus read-only inspection tools like trip_status, query_session, read_config, read_file, grep, search_facts, consult_diary, and consult_notes. Resolve the referent/correction, then retry ${name} if the action is still correct. Blocked ${mutationKindsFor(profile).join(", ")}. ${profile.reason}.`;
+}
+function mutationKindsFor(profile) {
+    const mutates = profile.mutates;
+    return typeof mutates === "string" ? [mutates] : [...mutates];
+}
+function orientationPolicyBlocks(profile, blockedMutationKinds) {
+    if (profile.risk !== "high")
+        return false;
+    return mutationKindsFor(profile).some((kind) => blockedMutationKinds.includes(kind));
 }
 async function execTool(name, args, ctx) {
     (0, runtime_1.emitNervesEvent)({
@@ -105,8 +237,8 @@ async function execTool(name, args, ctx) {
         message: "tool execution started",
         meta: { name, ...(name === "shell" && args.command ? { command: args.command } : {}) },
     });
-    // Look up from combined registry
-    const def = allDefinitions.find((d) => d.tool.function.name === name);
+    // Look up from combined registry (native + MCP)
+    const def = findDefinition(name);
     if (!def) {
         (0, runtime_1.emitNervesEvent)({
             level: "error",
@@ -117,13 +249,33 @@ async function execTool(name, args, ctx) {
         });
         return `unknown: ${name}`;
     }
+    const riskProfile = riskProfileForTool(def, name, args);
+    const orientationPolicy = ctx?.orientationFrame?.actionPolicy;
+    if (orientationPolicy?.mode === "correction_hold"
+        && orientationPolicyBlocks(riskProfile, orientationPolicy.blockedMutationKinds)) {
+        const reason = orientationPolicy.reason;
+        const message = orientationHoldMessage(name, riskProfile, reason);
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            event: "tool.orientation_hold_block",
+            component: "tools",
+            message: "orientation hold blocked high-risk tool execution",
+            meta: { name, mutates: mutationKindsFor(riskProfile), reason },
+        });
+        return message;
+    }
     // Guardrail check: structural + trust-level
+    const mcpDef = mcpDefinitions.find((d) => d.tool.function.name === name);
     const guardContext = {
         readPaths: tools_base_1.editFileReadTracker,
         trustLevel: ctx?.context?.friend?.trustLevel,
-        agentRoot: safeGetAgentRoot(),
+        agentRoot: ctx?.agentRoot ?? safeGetAgentRoot(),
+        friendId: ctx?.context?.friend?.id,
+        ...(mcpDef?.mcpServer ? { mcpServerName: mcpDef.mcpServer } : {}),
+        ...(ctx?.context?.isGroupChat !== undefined ? { isGroupChat: (ctx?.context).isGroupChat } : {}),
     };
-    const guardResult = (0, guardrails_1.guardInvocation)(name, args, guardContext);
+    const guardArgs = normalizeGuardArgs(name, args);
+    const guardResult = (0, guardrails_1.guardInvocation)(name, guardArgs, guardContext);
     if (!guardResult.allowed) {
         (0, runtime_1.emitNervesEvent)({
             level: "warn",
@@ -134,8 +286,37 @@ async function execTool(name, args, ctx) {
         });
         return guardResult.reason;
     }
+    const commerceReservation = COMMERCE_AUTHORITY_TOOLS.has(name) && guardContext.agentRoot
+        ? (0, store_1.reserveCommerceAuthority)({
+            agentRoot: guardContext.agentRoot,
+            token: guardArgs.commerce_authority,
+            toolName: name,
+            args: guardArgs,
+            friendId: guardContext.friendId,
+        })
+        : null;
+    if (commerceReservation && !commerceReservation.ok) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "warn",
+            event: "tool.guardrail_block",
+            component: "tools",
+            message: "guardrail blocked tool execution",
+            meta: { name, reason: commerceReservation.reason },
+        });
+        return `commerce authority required: ${commerceReservation.reason}`;
+    }
+    const toolContext = commerceReservation?.ok
+        ? {
+            ...ctx,
+            agentRoot: guardContext.agentRoot,
+            commerceAuthority: {
+                checkoutId: commerceReservation.checkoutId,
+                reservationToken: commerceReservation.reservationToken,
+            },
+        }
+        : ctx;
     try {
-        const result = await def.handler(args, ctx);
+        const result = await def.handler(args, toolContext);
         (0, runtime_1.emitNervesEvent)({
             event: "tool.end",
             component: "tools",
@@ -154,6 +335,22 @@ async function execTool(name, args, ctx) {
         });
         throw error;
     }
+    finally {
+        if (commerceReservation?.ok && guardContext.agentRoot) {
+            try {
+                (0, store_1.releaseReservedCommerceAuthority)({
+                    agentRoot: guardContext.agentRoot,
+                    checkoutId: commerceReservation.checkoutId,
+                    reservationToken: commerceReservation.reservationToken,
+                    toolName: name,
+                    friendId: guardContext.friendId,
+                });
+            }
+            catch {
+                /* v8 ignore next -- external tool result/error should not be masked by best-effort reservation cleanup @preserve */
+            }
+        }
+    }
 }
 function summarizeKeyValues(args, keys, maxValueLength = 60) {
     const parts = [];
@@ -176,65 +373,47 @@ function summarizeUnknownArgs(args) {
     return summarizeKeyValues(args, keys);
 }
 function summarizeArgs(name, args) {
-    // Check teams tools first
-    const teamsSummary = (0, tools_teams_1.summarizeTeamsArgs)(name, args);
-    if (teamsSummary !== undefined)
-        return teamsSummary;
-    // Check github tools
-    const githubSummary = (0, tools_github_1.summarizeGithubArgs)(name, args);
-    if (githubSummary !== undefined)
-        return githubSummary;
-    // Base tools
-    if (name === "read_file" || name === "write_file")
-        return summarizeKeyValues(args, ["path"]);
-    if (name === "edit_file")
-        return summarizeKeyValues(args, ["path"]);
-    if (name === "glob")
-        return summarizeKeyValues(args, ["pattern", "cwd"]);
-    if (name === "grep")
-        return summarizeKeyValues(args, ["pattern", "path", "include"]);
-    if (name === "shell")
-        return summarizeKeyValues(args, ["command"]);
-    if (name === "load_skill")
-        return summarizeKeyValues(args, ["name"]);
-    if (name === "coding_spawn")
-        return summarizeKeyValues(args, ["runner", "workdir", "taskRef"]);
-    if (name === "coding_status")
-        return summarizeKeyValues(args, ["sessionId"]);
-    if (name === "coding_tail")
-        return summarizeKeyValues(args, ["sessionId"]);
-    if (name === "coding_send_input")
-        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 === "set_reasoning_effort")
-        return summarizeKeyValues(args, ["level"]);
-    if (name === "claude")
-        return summarizeKeyValues(args, ["prompt"]);
-    if (name === "web_search")
-        return summarizeKeyValues(args, ["query"]);
-    if (name === "memory_search")
-        return summarizeKeyValues(args, ["query"]);
-    if (name === "memory_save")
-        return summarizeKeyValues(args, ["text", "about"]);
-    if (name === "get_friend_note")
-        return summarizeKeyValues(args, ["friendId"]);
-    if (name === "save_friend_note") {
-        return summarizeKeyValues(args, ["type", "key", "content"]);
-    }
-    if (name === "bridge_manage")
-        return summarizeKeyValues(args, ["action", "bridgeId", "objective", "friendId", "channel", "key"]);
-    if (name === "ado_backlog_list")
-        return summarizeKeyValues(args, ["organization", "project"]);
-    if (name === "ado_batch_update")
-        return summarizeKeyValues(args, ["organization", "project"]);
-    if (name === "ado_create_epic" || name === "ado_create_issue")
-        return summarizeKeyValues(args, ["organization", "project", "title"]);
-    if (name === "ado_move_items")
-        return summarizeKeyValues(args, ["organization", "project", "workItemIds"]);
-    if (name === "ado_restructure_backlog")
-        return summarizeKeyValues(args, ["organization", "project"]);
+    const def = findDefinition(name);
+    if (def && def.summaryKeys !== undefined) {
+        return summarizeKeyValues(args, def.summaryKeys);
+    }
     return summarizeUnknownArgs(args);
 }
+/**
+ * Build an enriched tool result summary for display on remote channels.
+ * For recognized tools, includes result-derived info (diff stats, exit codes, etc.).
+ * Falls back to arg-based summary for unrecognized tools.
+ */
+function buildToolResultSummary(name, args, _result, success) {
+    /* v8 ignore start -- branches: ?? fallbacks and ternaries in tool summary formatting @preserve */
+    switch (name) {
+        case "edit_file": {
+            if (!success)
+                return summarizeArgs(name, args);
+            const addedLines = (args.new_string ?? "").split("\n").length;
+            const removedLines = (args.old_string ?? "").split("\n").length;
+            return `+${addedLines} -${removedLines} lines in ${args.path ?? "unknown"}`;
+        }
+        case "shell": {
+            const cmd = args.command ?? "?";
+            const exitCode = success ? 0 : 1;
+            return `$ ${cmd} (exit ${exitCode})`;
+        }
+        case "read_file":
+            return `path=${args.path ?? "unknown"}`;
+        case "write_file":
+            return `path=${args.path ?? "unknown"}`;
+        case "glob":
+            return `pattern=${args.pattern ?? "?"} ${args.cwd ? `cwd=${args.cwd}` : ""}`.trim();
+        case "grep":
+            return `pattern=${args.pattern ?? "?"} ${args.path ? `path=${args.path}` : ""}`.trim();
+        case "coding_spawn": {
+            const taskRef = args.taskRef ?? "unknown";
+            const status = success ? "spawned" : "failed";
+            return `${taskRef} -> ${status}`;
+        }
+        default:
+            return summarizeArgs(name, args);
+    }
+    /* v8 ignore stop */
+}