@myvillage/cli 1.75.0 → 1.76.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myvillage/cli",
-  "version": "1.75.0",
+  "version": "1.76.0",
   "description": "MyVillageOS CLI for community developers",
   "type": "module",
   "bin": {

package/src/agent-runtime/builtin-tools.js

@@ -16,9 +16,39 @@ import { tool } from 'ai';
 import { z } from 'zod';
 import { appendRows, datasetExists, readManifest, ingestAsset } from '../utils/dataset-workspace.js';
 import { DATASET_APPEND_DESCRIPTION, MODEL_PREDICT_DESCRIPTION } from './builtin-tools-registry.js';
+import { readToolsYaml } from '../utils/local-agent.js';
 
 export { BUILTIN_TOOL_DEFS } from './builtin-tools-registry.js';
 
+/**
+ * Gate built-ins by the SAME allowlist as the MyVillageOS platform server
+ * (`allowed_tools` on whichever tools.yaml server points at a myvillageproject.ai
+ * URL). This lets built-ins be scoped from one place — the myvillage tool card —
+ * rather than a separate mechanism. Semantics match `applyToolAllowlist`:
+ *   - no allowlist on that server → all built-ins load (back-compatible)
+ *   - allowlist present → a built-in loads only if explicitly listed
+ */
+function applyBuiltinAllowlist(builtins, agentName) {
+  let allowed;
+  try {
+    const servers = readToolsYaml(agentName)?.servers ?? {};
+    const platform = Object.values(servers).find(
+      (s) =>
+        s && typeof s === 'object' && typeof s.url === 'string' &&
+        /(^|\.)myvillageproject\.ai/i.test(new URL(s.url).hostname),
+    );
+    allowed = platform?.allowed_tools;
+  } catch {
+    allowed = undefined;
+  }
+  if (!Array.isArray(allowed)) return builtins;
+  const filtered = {};
+  for (const [name, t] of Object.entries(builtins)) {
+    if (allowed.includes(name)) filtered[name] = t;
+  }
+  return filtered;
+}
+
 /**
  * Build the native built-in tools for an agent.
  * @param {string} agentName
@@ -26,7 +56,7 @@ export { BUILTIN_TOOL_DEFS } from './builtin-tools-registry.js';
  * @returns {Record<string, object>} AI SDK tools keyed by tool name
  */
 export function getBuiltinTools(agentName, config) {
-  return {
+  const all = {
     dataset_append: tool({
       description: DATASET_APPEND_DESCRIPTION,
       inputSchema: z.object({
@@ -122,4 +152,5 @@ export function getBuiltinTools(agentName, config) {
       },
     }),
   };
+  return applyBuiltinAllowlist(all, agentName);
 }

package/src/agent-runtime/mcp-client.js

@@ -5,9 +5,15 @@
 import { readFileSync } from 'fs';
 import { join } from 'path';
 import { parse as parseYaml } from 'yaml';
+import { BUILTIN_TOOL_DEFS } from './builtin-tools-registry.js';
 
 const activeClients = [];
 
+// Built-in tools share the MyVillageOS server's `allowed_tools` list (they're
+// scoped from the same card), so their names legitimately appear there even
+// though they aren't exposed by any MCP server — don't flag them as "unknown".
+const BUILTIN_TOOL_NAMES = new Set(BUILTIN_TOOL_DEFS.map((d) => d.name));
+
 // ── Public API ──────────────────────────────────────────
 
 export async function getMCPTools(agentDir, agentConfig) {
@@ -201,7 +207,7 @@ export function applyToolAllowlist(tools, allowed, serverName) {
   for (const [name, tool] of Object.entries(tools)) {
     if (allow.has(name)) filtered[name] = tool;
   }
-  const unknown = allowed.filter((n) => !(n in tools));
+  const unknown = allowed.filter((n) => !(n in tools) && !BUILTIN_TOOL_NAMES.has(n));
   if (unknown.length > 0) {
     console.error(
       `[mcp-client] ${serverName}: allowed_tools lists ${unknown.length} tool(s) this server doesn't expose: ${unknown.join(', ')}`,