agency-lang 0.7.8 → 0.8.1

package/dist/lib/agents/agency-agent/agent.agency

@@ -18,7 +18,13 @@ import {
   cliPolicyHandler,
   parsePolicyFile,
   setPolicy,
+  minimalAutoApprovePolicy,
+  recommendedAutoApprovePolicy,
+  builtinPolicy,
+  builtinPolicyNames,
+  BUILTIN_POLICIES,
  } from "std::policy"
+import { loadMcpToolsWithStatus, mergeMcpServers, isMcpAvailable, readProjectMcpConfig } from "std::mcp"
 import { exists } from "std::shell"
 import { commandsDir, expandSlash } from "std::skills"
 import { highlight } from "std::syntax"
@@ -49,13 +55,6 @@ import {
   HISTORY_PATH,
   ALWAYS_FIELDS,
  } from "./lib/config.agency"
-import {
-  minimalAutoApprovePolicy,
-  recommendedAutoApprovePolicy,
-  builtinPolicy,
-  builtinPolicyNames,
-  BUILTIN_POLICIES,
- } from "./lib/defaultPolicy.agency"
 import { filterHostedModels, ModelFilters } from "./lib/modelFilters.agency"
 import { parseModelFlag, parseModelSpec, knownProviders, embeddingSpecHasProvider, missingProviderEnvVar, Resolved } from "./lib/models.agency"
 import { SLOTS } from "./lib/slots.agency"
@@ -80,8 +79,10 @@ import {
   providerLacksEmbeddings,
  } from "./lib/capabilities.agency"
 import {
+  Settings,
   getCapabilitySettings,
   getModelSettings,
+  getMcpServers,
   loadSettings,
   saveSettings,
  } from "./lib/settings.agency"
@@ -235,6 +236,9 @@ export def retryReasonLabel(reason: string): string {
   if (reason == "serverError") {
     return "Server error"
   }
+  if (reason == "invalidStructuredOutput") {
+    return "Output failed validation"
+  }
   return reason
 }
 
@@ -339,6 +343,7 @@ def builtinPalette(): Record<string, string> {
     "/local": "Switch to a local model",
     "/search": "Choose the web search backend (hosted / Tavily / Brave / off)",
     "/settings": "View and change capability settings for the current model",
+    "/mcp": "List configured MCP servers and their tools",
     "/paste": "Multi-line paste mode (Ctrl+D submits, Ctrl+C cancels)",
     "/help": "Show available slash commands"
   }
@@ -854,7 +859,7 @@ def _runTurn(msg: string): boolean {
   }
   if (trimmed == "/help") {
     pushMessage(
-      "Commands: /exit, /clear, /clear-history, /cost, /model, /models, /local, /search, /settings, /paste, /help",
+      "Commands: /exit, /clear, /clear-history, /cost, /model, /models, /local, /search, /settings, /mcp, /paste, /help",
     )
     return true
   }
@@ -863,6 +868,30 @@ def _runTurn(msg: string): boolean {
     editCapabilities()
     return true
   }
+  if (trimmed == "/mcp") {
+    if (!isMcpAvailable()) {
+      pushMessage(color.yellow("MCP is not installed. Run: npm install @agency-lang/mcp"))
+      return true
+    }
+    const merged = mergeMcpServers(getMcpServers(loadSettings()), readProjectMcpConfig(cwd()))
+    if (keys(merged).length == 0) {
+      pushMessage(color.dim("No MCP servers configured. Add an mcpServers block to agency.json or settings.json."))
+      return true
+    }
+    pushMessage(color.bold("MCP servers:"))
+    for (name in keys(merged)) {
+      // mcpServerStatus is populated at session start. A server present in the
+      // config but absent from the status map was never loaded (e.g. /mcp run
+      // before startup finished) — show it as unknown rather than connected.
+      let status = mcpServerStatus[name]
+      if (status == null) {
+        status = "not loaded"
+      }
+      pushMessage("  ${name} — ${status}")
+    }
+    pushMessage(color.dim("Loaded ${mcpTools.length} MCP tool(s) this session."))
+    return true
+  }
   if (trimmed == "/search") {
     const opts = availableBackendItems()
     const choice = chooseOption(
@@ -1303,6 +1332,46 @@ static const mainAgentTools = [
   generateImageFile,
 ]
 
+// MCP tools are appended to the coordinator's tools. ORDERING CONTRACT:
+// maybeLoadMcp (session start, in main()) must run before mainAgent's first
+// turn, or MCP tools silently vanish.
+let mcpTools: any[] = []
+// Per-server load outcome ("connected" / "unavailable"), for /mcp.
+let mcpServerStatus: Record<string, string> = {}
+
+export def setMcpTools(tools: any[]) {
+  mcpTools = tools
+}
+
+def setMcpServerStatus(status: Record<string, string>) {
+  mcpServerStatus = status
+}
+
+// MCP OAuth notification. The @agency-lang/mcp package opens the browser itself
+// (macOS-only today); we only print the URL so the user can complete auth.
+def onMcpOAuth(data: any) {
+  print(color.yellow("MCP authorization needed — opening browser. If it does not open, visit:\n${data.authUrl}"))
+}
+
+/** Load MCP tools from the project agency.json merged with the global settings
+  and hand them to the coordinator. No-op when @agency-lang/mcp is not installed
+  or no servers are configured. loadMcpTools warns-and-skips internally on any
+  per-server failure, so it always returns an array. */
+def maybeLoadMcp(settings: Settings) {
+  if (!isMcpAvailable()) {
+    return
+  }
+  const merged = mergeMcpServers(getMcpServers(settings), readProjectMcpConfig(cwd()))
+  if (keys(merged).length == 0) {
+    return
+  }
+  // Always returns a result (per-server failures warn-and-skip internally), so
+  // there is no Failure branch. The status map drives /mcp.
+  const loaded = loadMcpToolsWithStatus(merged, onMcpOAuth)
+  setMcpTools(loaded.tools)
+  setMcpServerStatus(loaded.status)
+}
+
 /** Enable memory when the capability profile allows it. When the user
   pointed the embedding slot at a provider, embeddings run there. A
   missing API key degrades to the default embedding behavior with one
@@ -1357,7 +1426,7 @@ def mainAgent(prompt: string | (string | Attachment)[]): string {
     }
     const result = llm(prompt, {
       memory: true,
-      tools: mainAgentTools
+      tools: [...mainAgentTools, ...mcpTools]
     })
   }
   return result
@@ -1860,6 +1929,10 @@ node main() {
   // before any handler/REPL is installed.
   maybeEnableMemory()
 
+  // Connect configured MCP servers and hand their (policy-gated) tools to the
+  // coordinator. Must run before the first turn (mcpTools ordering contract).
+  maybeLoadMcp(loadSettings())
+
   // Positional args (everything after flags) are joined with spaces to
   // form the starting prompt. `--` ends flag parsing if a positional
   // would otherwise look like a flag.