@agent-native/core 0.6.1 → 0.7.1

package/dist/server/agent-chat-plugin.js

@@ -1,15 +1,19 @@
+import { runWithRequestContext, getRequestOrgId } from "./request-context.js";
 import { getH3App } from "./framework-request-handler.js";
 import { createProductionAgentHandler, runAgentLoop, actionsToEngineTools, getActiveRunForThreadAsync, abortRun, subscribeToRun, } from "../agent/production-agent.js";
 import { resolveEngine, createAnthropicEngine } from "../agent/engine/index.js";
+import { McpClientManager, loadMcpConfig, autoDetectMcpConfig, mcpToolsToActionEntries, } from "../mcp-client/index.js";
 import { discoverAgents } from "./agent-discovery.js";
 import { loadSchemaPromptBlock } from "./schema-prompt.js";
 import { buildAssistantMessage, extractThreadMeta, } from "../agent/thread-data-builder.js";
 import { defineEventHandler, setResponseStatus, setResponseHeader, getMethod, getQuery, } from "h3";
 import { getSession } from "./auth.js";
+import { getOrigin } from "./google-oauth.js";
 import { createThread, getThread, listThreads, searchThreads, updateThreadData, deleteThread, } from "../chat-threads/store.js";
 import { resourceListAccessible, resourceList, resourceGet, resourceGetByPath, ensurePersonalDefaults, SHARED_OWNER, } from "../resources/store.js";
 import nodePath from "node:path";
 import { readBody } from "./h3-helpers.js";
+import { getBuilderBrowserConnectUrl, requestBuilderBrowserConnection, } from "./builder-browser.js";
 // Lazy fs — loaded via dynamic import() on first use.
 // This avoids require() which bundlers convert to createRequire(import.meta.url)
 // that crashes on CF Workers where import.meta.url is undefined.
@@ -68,16 +72,53 @@ function wrapCliScript(tool, cliDefault) {
         },
     };
 }
+/**
+ * Creates the docs-search tool so agents can look up framework documentation.
+ * Docs are bundled in @agent-native/core and read via fs at runtime.
+ */
+async function createDocsScriptEntries() {
+    try {
+        const mod = await import("../scripts/docs/search.js");
+        return {
+            "docs-search": wrapCliScript({
+                description: "Search and read agent-native framework documentation. Use --list to see all pages, --query to search, --slug to read a specific page.",
+                parameters: {
+                    type: "object",
+                    properties: {
+                        query: {
+                            type: "string",
+                            description: "Search term to find relevant docs (e.g. 'actions', 'authentication', 'database')",
+                        },
+                        slug: {
+                            type: "string",
+                            description: "Read a specific doc page by slug (e.g. 'actions', 'authentication', 'database')",
+                        },
+                        list: {
+                            type: "string",
+                            description: 'Set to "true" to list all available doc pages',
+                            enum: ["true"],
+                        },
+                    },
+                },
+            }, mod.default),
+        };
+    }
+    catch {
+        return {};
+    }
+}
 /**
  * Creates resource ScriptEntries available in both prod and dev modes.
  */
 async function createResourceScriptEntries() {
     try {
-        const [list, read, write, del] = await Promise.all([
+        const [list, read, write, del, saveMem, delMem] = await Promise.all([
             import("../scripts/resources/list.js"),
             import("../scripts/resources/read.js"),
             import("../scripts/resources/write.js"),
             import("../scripts/resources/delete.js"),
+            import("../scripts/resources/save-memory.js"),
+            import("../scripts/resources/delete-memory.js"),
         ]);
         return {
             "resource-list": wrapCliScript({
@@ -164,6 +205,45 @@ async function createResourceScriptEntries() {
                     required: ["path"],
                 },
             }, del.default),
+            "save-memory": wrapCliScript({
+                description: "Save a memory for future conversations. Creates or updates a memory file and its index entry. Use proactively when you learn preferences, corrections, project context, or references.",
+                parameters: {
+                    type: "object",
+                    properties: {
+                        name: {
+                            type: "string",
+                            description: "Short kebab-case identifier (e.g. 'coding-style', 'deploy-process'). Used as the filename.",
+                        },
+                        type: {
+                            type: "string",
+                            description: "Memory category",
+                            enum: ["user", "feedback", "project", "reference"],
+                        },
+                        description: {
+                            type: "string",
+                            description: "One-line summary shown in the memory index (keep under 80 chars)",
+                        },
+                        content: {
+                            type: "string",
+                            description: "The memory content in markdown. For updates, read first and provide full updated content.",
+                        },
+                    },
+                    required: ["name", "type", "description", "content"],
+                },
+            }, saveMem.default),
+            "delete-memory": wrapCliScript({
+                description: "Delete a memory entry and remove it from the memory index.",
+                parameters: {
+                    type: "object",
+                    properties: {
+                        name: {
+                            type: "string",
+                            description: "The memory name to delete (e.g. 'coding-style')",
+                        },
+                    },
+                    required: ["name"],
+                },
+            }, delMem.default),
         };
     }
     catch {
@@ -260,6 +340,68 @@ async function createCallAgentScriptEntry(selfAppId) {
         return {};
     }
 }
+function createBuilderBrowserTool(deps) {
+    return {
+        "get-browser-connection": {
+            tool: {
+                description: "Provision a Builder-backed browser session and return browser websocket connection details. If Builder browser access is not configured yet, this returns setup guidance instead.",
+                parameters: {
+                    type: "object",
+                    properties: {
+                        sessionId: {
+                            type: "string",
+                            description: "Stable browser session identifier. Reuse it to reconnect to the same browser session.",
+                        },
+                        projectId: {
+                            type: "string",
+                            description: "Optional Builder project or space identifier to scope the session.",
+                        },
+                        branchName: {
+                            type: "string",
+                            description: "Optional branch name for Builder preview sessions.",
+                        },
+                        proxyOrigin: {
+                            type: "string",
+                            description: "Optional source origin to proxy from when browsing a local app.",
+                        },
+                        proxyDefaultOrigin: {
+                            type: "string",
+                            description: "Optional default origin that the browser should use for proxied requests.",
+                        },
+                        proxyDestination: {
+                            type: "string",
+                            description: "Optional destination origin for proxying local development traffic.",
+                        },
+                    },
+                    required: ["sessionId"],
+                },
+            },
+            run: async (args) => {
+                if (!process.env.BUILDER_PRIVATE_KEY ||
+                    !process.env.BUILDER_PUBLIC_KEY) {
+                    return JSON.stringify({
+                        configured: false,
+                        message: "Builder browser access is not configured. Connect Builder from the workspace Resources panel before requesting a browser session.",
+                        connectUrl: getBuilderBrowserConnectUrl(deps.getOrigin()),
+                    });
+                }
+                const connection = await requestBuilderBrowserConnection({
+                    sessionId: args.sessionId,
+                    projectId: args.projectId,
+                    branchName: args.branchName,
+                    proxyOrigin: args.proxyOrigin,
+                    proxyDefaultOrigin: args.proxyDefaultOrigin,
+                    proxyDestination: args.proxyDestination,
+                });
+                return JSON.stringify({
+                    configured: true,
+                    sessionId: args.sessionId,
+                    ...connection,
+                });
+            },
+        },
+    };
+}
 /**
  * Creates agent team orchestration tools (spawn-task, task-status, read-task-result).
  * These let the main agent spawn sub-agents and coordinate work.
@@ -284,6 +426,10 @@ function createTeamTools(deps) {
                             type: "string",
                             description: "Short name for the sub-agent tab (e.g. 'Research', 'Draft email'). If omitted, derived from the task.",
                         },
+                        agent: {
+                            type: "string",
+                            description: "Optional custom agent profile from agents/*.md to use for this task.",
+                        },
                     },
                     required: ["task"],
                 },
@@ -302,14 +448,32 @@ function createTeamTools(deps) {
                     "list-tasks",
                 ]);
                 const subAgentActions = Object.fromEntries(Object.entries(deps.getActions()).filter(([name]) => !teamToolNames.has(name)));
+                let instructions = args.instructions;
+                let selectedModel = deps.getModel();
+                let selectedName = args.name || "";
+                if (args.agent) {
+                    const { findAccessibleCustomAgent } = await import("../resources/agents.js");
+                    const profile = await findAccessibleCustomAgent(deps.getOwner(), args.agent);
+                    if (!profile) {
+                        throw new Error(`Custom agent not found: ${args.agent}`);
+                    }
+                    const profileInstructions = `## Custom Agent Profile: ${profile.name}\n\n` +
+                        (profile.description ? `${profile.description}\n\n` : "") +
+                        profile.instructions;
+                    instructions = instructions
+                        ? `${profileInstructions}\n\n## Extra Task Context\n\n${instructions}`
+                        : profileInstructions;
+                    selectedModel = profile.model ?? selectedModel;
+                    selectedName = selectedName || profile.name;
+                }
                 const task = await spawnTask({
                     description: args.task,
-                    instructions: args.instructions,
+                    instructions,
                     ownerEmail: deps.getOwner(),
                     systemPrompt: deps.getSystemPrompt(),
                     actions: subAgentActions,
                     engine: deps.getEngine(),
-                    model: deps.getModel(),
+                    model: selectedModel,
                     parentThreadId: deps.getParentThreadId(),
                     parentSend: (event) => {
                         if (capturedSend)
@@ -321,7 +485,7 @@ function createTeamTools(deps) {
                     threadId: task.threadId,
                     status: task.status,
                     description: task.description,
-                    name: args.name || "",
+                    name: selectedName,
                 });
             },
         },
@@ -455,16 +619,16 @@ const FRAMEWORK_CORE = `
 2. **Context awareness** — The user's current screen state is automatically included in each message as a \`<current-screen>\` block. Use it to understand what the user is looking at. You can still call \`view-screen\` for a more detailed snapshot if needed, but you should NOT need to call it before every action.
 3. **Navigate the UI** — Use the \`navigate\` tool to switch views, open items, or focus elements for the user.
 4. **Application state** — Ephemeral UI state (drafts, selections, navigation) lives in \`application_state\`. Use \`readAppState\`/\`writeAppState\` to read and write it. When you write state, the UI updates automatically.
-5. **Resources for memory** — Use the Resources system for persistent notes and context. Update LEARNINGS.md when you learn user preferences or corrections. Update the shared AGENTS.md for instructions that should apply to all users.
+5. **Memory** — Use the structured memory system to persist knowledge across sessions. Use \`save-memory\` proactively when you learn preferences, corrections, or project context. Update shared AGENTS.md for instructions that should apply to all users.
+6. **Security** — Always use \`defineAction\` with a Zod \`schema:\` for input validation. Never construct SQL with string concatenation — use parameterized queries via db-query/db-exec. Never use \`dangerouslySetInnerHTML\`, \`innerHTML\`, or \`eval()\`. Never expose secrets in responses or source code. Every table with user data must have \`owner_email\`.
 
 ### Resources
 
-You have access to a Resources system for persistent notes, learnings, and context files.
+You have access to a Resources system for persistent notes and context files.
 Use resource-list, resource-read, resource-write, and resource-delete to manage resources.
 Resources can be personal (per-user) or shared (team-wide). By default, resources are personal.
 
-When you learn something important (user corrections, preferences, patterns), update the "LEARNINGS.md" resource. Keep it tidy — revise, consolidate, and remove outdated entries rather than only appending.
-When the user gives instructions that should apply to all users/sessions, update the shared "AGENTS.md" resource instead.
+When the user gives instructions that should apply to all users/sessions, update the shared "AGENTS.md" resource.
 
 ### Navigation Rule
 
@@ -481,7 +645,7 @@ When the user asks to find a previous conversation, use \`search-chats\` first t
 ### Agent Teams — Orchestration
 
 You are an orchestrator. For complex or multi-step tasks, delegate to sub-agents:
-- \`spawn-task\` — Spawn a sub-agent for a task. It runs in its own thread while you stay available. A live preview card appears in the chat.
+- \`spawn-task\` — Spawn a sub-agent for a task. It runs in its own thread while you stay available. A live preview card appears in the chat. You can optionally choose a custom agent profile from \`agents/*.md\`.
 - \`task-status\` — Check the progress of a running sub-agent.
 - \`read-task-result\` — Read the result when a sub-agent finishes.
 
@@ -497,7 +661,7 @@ You are an orchestrator. For complex or multi-step tasks, delegate to sub-agents
 4. Use \`read-task-result\` to check results when needed, or the user can see live progress in the card.
 5. If the user's request has multiple steps, you can spawn one sub-agent per step, or chain them.
 
-Sub-agents have access to all template tools but **cannot spawn sub-agents themselves** — only you (the orchestrator) can do that. Give the sub-agent a specific, actionable task description — it will figure out which tools to use.
+Sub-agents have access to all template tools but **cannot spawn sub-agents themselves** — only you (the orchestrator) can do that. Give the sub-agent a specific, actionable task description — it will figure out which tools to use. If a matching custom agent profile exists, pass it via the \`agent\` parameter on \`spawn-task\`.
 
 ### Recurring Jobs
 
@@ -518,6 +682,14 @@ When the user asks for something recurring ("every morning", "daily at 9am", "we
 
 Job instructions should be self-contained — include which actions to call, what conditions to check, and what to do with results. The agent executing the job has access to all the same tools you do.
 
+### Browser Access
+
+Use \`get-browser-connection\` when you need a real browser session backed by Builder. It returns websocket connection details for a provisioned browser session.
+
+- If the tool says Builder is not configured, tell the user to connect Builder from the workspace Resources panel.
+- Reuse a stable \`sessionId\` when you want to reconnect to the same browser session.
+- Include proxy parameters when you need the browser to reach a local dev server through Builder's browser connection flow.
+
 ### call-agent — External Apps Only
 
 The \`call-agent\` tool sends a message to a DIFFERENT, separately-deployed app's agent (A2A protocol). It is **not** for calling actions within the current app.
@@ -534,15 +706,34 @@ The \`call-agent\` tool sends a message to a DIFFERENT, separately-deployed app'
 
 If \`call-agent\` returns an error saying the agent is yourself — stop and use your own tools instead.
 
-### Auto-Memory
+### Structured Memory
+
+You have a structured memory system. Your memory index (\`memory/MEMORY.md\`) is loaded at the start of every conversation (shown above). Individual memories are stored as separate files under \`memory/\`.
 
-Proactively update \`LEARNINGS.md\` when you learn something important during conversations:
-- User corrects your approach → capture the correct way
-- User shares preferences (tone, style, workflow) → capture them
-- You discover a non-obvious pattern or gotcha → capture it
-- User provides personal context (contacts, team info, domain knowledge) → capture it
+**Tools:**
+- \`save-memory\` — Create or update a memory. Provide name, type, description, and content. Atomically updates both the memory file and the index.
+- \`delete-memory\` — Remove a memory and its index entry.
+- \`resource-read --path memory/<name>.md\` — Read the full content of a specific memory when you need details beyond the index.
 
-**Don't ask permission — just save it.** Keep entries concise (one line each, grouped by category). Don't save things that are obvious from reading the code or that are temporary.
+**Memory types:**
+- \`user\` — Preferences, role, personal context, contacts
+- \`feedback\` — Corrections ("don't do X, do Y instead"), confirmed approaches
+- \`project\` — Ongoing work context, decisions, status
+- \`reference\` — Pointers to external systems, URLs, API details
+
+**When to save (do it proactively, don't ask permission):**
+- User corrects your approach → save as \`feedback\`
+- User shares preferences (tone, style, workflow) → save as \`user\`
+- You discover a non-obvious pattern or gotcha → save as \`feedback\`
+- User provides personal context (contacts, team, domain) → save as \`user\`
+- A project gains enough context to track → save as \`project\`
+
+**Rules:**
+- Don't save things obvious from the code or standard framework behavior
+- When updating an existing memory, read it first and merge — don't overwrite blindly
+- Keep descriptions concise — the index is loaded every message
+- One memory per logical topic (e.g. 'coding-style', 'project-alpha')
+- Don't save temporary debugging notes or ephemeral task details
 `;
 const PROD_FRAMEWORK_PROMPT = `## Agent-Native Framework — Production Mode
 
@@ -594,19 +785,17 @@ ${FRAMEWORK_CORE}`;
 const DEFAULT_SYSTEM_PROMPT = PROD_FRAMEWORK_PROMPT;
 /**
  * Pre-load the agent's context: AGENTS.md (template instructions), the skills
- * index, and LEARNINGS.md (user notes). These all get appended to the system
- * prompt so the agent has everything it needs from the first turn — no tool
- * calls required to figure out "what is this app".
+ * index, shared LEARNINGS.md (team notes), and memory/MEMORY.md (personal
+ * structured memory index). These all get appended to the system prompt so
+ * the agent has everything it needs from the first turn.
  *
- * Three sources are layered:
+ * Four sources are layered:
  *
- *   1. `<template>` — AGENTS.md + skills index from the `virtual:agents-bundle`
- *      module (inlined at build time by the Vite plugin, falls back to a
- *      filesystem read from `process.cwd()` in dev). Canonical source for
- *      "what is this app, what can it do, what skills are available".
- *   2. `<shared>` — LEARNINGS.md from the SQL shared scope. Team-level notes.
- *   3. `<personal>` — LEARNINGS.md from the SQL personal scope. The current
- *      user's own notes.
+ *   1. `<workspace>` — AGENTS.md from the enterprise workspace core.
+ *   2. `<template>` — AGENTS.md + skills index from the Vite plugin bundle.
+ *   3. `<shared>` — LEARNINGS.md from the SQL shared scope. Team-level notes.
+ *   4. `<personal>` — memory/MEMORY.md from the SQL personal scope. The
+ *      current user's structured memory index.
  *
  * Each source is read independently — no copying between them. Editing
  * AGENTS.md and restarting the server is all it takes; Vite HMR invalidates
@@ -615,10 +804,15 @@ const DEFAULT_SYSTEM_PROMPT = PROD_FRAMEWORK_PROMPT;
 async function loadResourcesForPrompt(owner) {
     await ensurePersonalDefaults(owner);
     const sections = [];
-    // 1. Template AGENTS.md + skills index — from the virtual bundle.
+    // 1. Workspace AGENTS.md + skills merged into the template bundle.
     try {
         const { loadAgentsBundle, generateSkillsPromptBlock } = await import("./agents-bundle.js");
         const bundle = await loadAgentsBundle();
+        // Workspace-core AGENTS.md (enterprise-wide instructions), if present.
+        if (bundle.workspaceAgentsMd && bundle.workspaceAgentsMd.trim()) {
+            sections.push(`<resource name="AGENTS.md" scope="workspace">\n${bundle.workspaceAgentsMd.trim()}\n</resource>`);
+        }
+        // 2. Template AGENTS.md.
         if (bundle.agentsMd.trim()) {
             sections.push(`<resource name="AGENTS.md" scope="template">\n${bundle.agentsMd.trim()}\n</resource>`);
         }
@@ -636,12 +830,12 @@ async function loadResourcesForPrompt(owner) {
         }
     }
     catch { }
-    // 3. Personal SQL scope (skip if owner is the shared sentinel)
+    // 3. Personal memory index (skip if owner is the shared sentinel)
     if (owner !== SHARED_OWNER) {
         try {
-            const personal = await resourceGetByPath(owner, "LEARNINGS.md");
-            if (personal?.content?.trim()) {
-                sections.push(`<resource name="LEARNINGS.md" scope="personal">\n${personal.content.trim()}\n</resource>`);
+            const memoryIndex = await resourceGetByPath(owner, "memory/MEMORY.md");
+            if (memoryIndex?.content?.trim()) {
+                sections.push(`<resource name="memory/MEMORY.md" scope="personal">\n${memoryIndex.content.trim()}\n</resource>`);
             }
         }
         catch { }
@@ -660,7 +854,7 @@ async function buildSchemaBlock(owner, hasRawDbTools) {
     try {
         return await loadSchemaPromptBlock({
             owner,
-            orgId: process.env.AGENT_ORG_ID ?? null,
+            orgId: getRequestOrgId() ?? null,
             hasRawDbTools,
         });
     }
@@ -851,19 +1045,66 @@ export function createAgentChatPlugin(options) {
         const canToggle = (env === "development" || env === "test") &&
             process.env.AGENT_MODE !== "production";
         const routePath = options?.path ?? "/_agent-native/agent-chat";
+        // Initialize MCP client (connects to user-configured local MCP servers).
+        // Graceful-degrade: any failure yields zero MCP tools and agent-chat keeps
+        // working as before. No-op outside Node runtimes.
+        let mcpConfig = loadMcpConfig();
+        if (!mcpConfig) {
+            mcpConfig = autoDetectMcpConfig();
+            if (mcpConfig) {
+                const detected = Object.keys(mcpConfig.servers).join(", ");
+                console.log(`[mcp-client] auto-detected ${detected}, registering as MCP server — set AGENT_NATIVE_DISABLE_MCP_AUTODETECT=1 to opt out`);
+            }
+            else {
+                console.log("[mcp-client] no mcp.config.json and no auto-detectable servers — skipping MCP tools");
+            }
+        }
+        else if (mcpConfig.source) {
+            console.log(`[mcp-client] loaded config from ${mcpConfig.source} (${Object.keys(mcpConfig.servers).length} server(s))`);
+        }
+        const mcpManager = new McpClientManager(mcpConfig);
+        try {
+            await mcpManager.start();
+        }
+        catch (err) {
+            console.warn(`[mcp-client] start() failed: ${err?.message ?? err}. Continuing without MCP tools.`);
+        }
+        setGlobalMcpManager(mcpManager);
+        const mcpActionEntries = mcpToolsToActionEntries(mcpManager);
+        // Mount status route so tooling/onboarding can inspect MCP state.
+        mountMcpStatusRoute(nitroApp, mcpManager);
+        // Ensure we tear down child processes if the host shuts down cleanly.
+        if (typeof process !== "undefined" &&
+            typeof process.once === "function" &&
+            !globalThis.__agentNativeMcpExitHooked) {
+            globalThis.__agentNativeMcpExitHooked = true;
+            const stop = () => {
+                const mgr = getGlobalMcpManager();
+                if (mgr)
+                    void mgr.stop();
+            };
+            process.once("exit", stop);
+            process.once("SIGTERM", stop);
+            process.once("SIGINT", stop);
+        }
         // Resolve actions — prefer `actions`, fall back to deprecated `scripts`
         const rawActions = options?.actions ?? options?.scripts;
         const templateScripts = typeof rawActions === "function"
             ? await rawActions()
             : (rawActions ?? {});
-        // Resource, chat, and cross-agent scripts are available in both prod and dev modes
+        // Resource, chat, docs, and cross-agent scripts are available in both prod and dev modes
         const resourceScripts = await createResourceScriptEntries();
+        const docsScripts = await createDocsScriptEntries();
         const engineScripts = await createAgentEngineScriptEntries();
         const chatScripts = {
             ...(await createChatScriptEntries()),
             ...engineScripts,
         };
         const callAgentScript = await createCallAgentScriptEntry(options?.appId);
+        let _currentRequestOrigin = "http://localhost:3000";
+        const browserTools = createBuilderBrowserTool({
+            getOrigin: () => _currentRequestOrigin,
+        });
         // Auto-mount A2A protocol endpoints so every app is discoverable
         // and callable by other agents via the standard protocol.
         // In dev mode, include dev scripts (filesystem-discovered) so the A2A agent
@@ -1001,16 +1242,20 @@ export function createAgentChatPlugin(options) {
         const allScripts = canToggle
             ? {
                 ...resourceScripts,
+                ...docsScripts,
                 ...chatScripts,
                 ...callAgentScript,
+                ...browserTools,
                 ...devScriptsForA2A,
             }
             : {
                 ...discoveredActions,
                 ...templateScripts,
                 ...resourceScripts,
+                ...docsScripts,
                 ...chatScripts,
                 ...callAgentScript,
+                ...browserTools,
                 ...devScriptsForA2A,
             };
         const { mountA2A } = await import("../a2a/server.js");
@@ -1100,13 +1345,17 @@ export function createAgentChatPlugin(options) {
                 const a2aActions = canToggle
                     ? {
                         ...resourceScripts,
+                        ...docsScripts,
                         ...chatScripts,
+                        ...browserTools,
                         ...devScriptsForA2A,
                     }
                     : {
                         ...templateScripts,
                         ...resourceScripts,
+                        ...docsScripts,
                         ...chatScripts,
+                        ...browserTools,
                     };
                 const a2aTools = actionsToEngineTools(a2aActions);
                 const a2aMessages = [
@@ -1192,12 +1441,14 @@ export function createAgentChatPlugin(options) {
                 const mcpActions = canToggle
                     ? {
                         ...resourceScripts,
+                        ...docsScripts,
                         ...chatScripts,
                         ...devScriptsForA2A,
                     }
                     : {
                         ...templateScripts,
                         ...resourceScripts,
+                        ...docsScripts,
                         ...chatScripts,
                     };
                 const mcpTools = actionsToEngineTools(mcpActions);
@@ -1322,12 +1573,14 @@ export function createAgentChatPlugin(options) {
                     // Sub-agents spawned in dev mode also invoke template actions
                     // via shell, so omit them from the native tool registry.
                     ...resourceScripts,
+                    ...docsScripts,
                     ...chatScripts,
                     ...devScriptsForA2A,
                 }
                 : {
                     ...templateScripts,
                     ...resourceScripts,
+                    ...docsScripts,
                     ...chatScripts,
                 },
             getEngine: () => createAnthropicEngine({
@@ -1352,10 +1605,13 @@ export function createAgentChatPlugin(options) {
         const prodActions = {
             ...templateScripts,
             ...resourceScripts,
+            ...docsScripts,
             ...chatScripts,
             ...callAgentScript,
             ...teamTools,
             ...jobTools,
+            ...browserTools,
+            ...mcpActionEntries,
         };
         // Always build the production handler (includes resource tools + call-agent + team tools)
         // In production mode (!canToggle), enable usage tracking and limits
@@ -1363,6 +1619,7 @@ export function createAgentChatPlugin(options) {
         const prodHandler = createProductionAgentHandler({
             actions: prodActions,
             systemPrompt: async (event) => {
+                _currentRequestOrigin = getOrigin(event);
                 const owner = await getOwnerFromEvent(event);
                 _currentRunOwner = owner;
                 const resources = await loadResourcesForPrompt(owner);
@@ -1398,15 +1655,19 @@ export function createAgentChatPlugin(options) {
             // listed in the dev system prompt's "Available Actions" section.
             const devActions = {
                 ...resourceScripts,
+                ...docsScripts,
                 ...chatScripts,
                 ...callAgentScript,
                 ...teamTools,
                 ...jobTools,
+                ...browserTools,
+                ...mcpActionEntries,
                 ...(await createDevScriptRegistry()),
             };
             devHandler = createProductionAgentHandler({
                 actions: devActions,
                 systemPrompt: async (event) => {
+                    _currentRequestOrigin = getOrigin(event);
                     const owner = await getOwnerFromEvent(event);
                     _currentRunOwner = owner;
                     const resources = await loadResourcesForPrompt(owner);
@@ -1750,7 +2011,29 @@ export function createAgentChatPlugin(options) {
                             }
                         })());
                     }
-                    // 4. Peer agent discovery (network call — often slowest)
+                    // 4. Custom workspace agents
+                    sources.push((async () => {
+                        try {
+                            const owner = await getOwnerFromEvent(event);
+                            const { listAccessibleCustomAgents } = await import("../resources/agents.js");
+                            const agents = await listAccessibleCustomAgents(owner);
+                            flush(agents.map((agent) => ({
+                                id: `custom-agent:${agent.id}`,
+                                label: agent.name,
+                                description: agent.description || agent.path,
+                                icon: "agent",
+                                source: "agent:custom",
+                                refType: "custom-agent",
+                                refPath: agent.path,
+                                refId: agent.id,
+                                section: "Agents",
+                            })));
+                        }
+                        catch (e) {
+                            console.error("[agent-native] Custom agent discovery failed:", e);
+                        }
+                    })());
+                    // 5. Peer agent discovery (network call — often slowest)
                     sources.push((async () => {
                         try {
                             const agents = await discoverAgents(options?.appId);
@@ -1763,7 +2046,7 @@ export function createAgentChatPlugin(options) {
                                 refType: "agent",
                                 refPath: agent.url,
                                 refId: agent.id,
-                                section: "Agents",
+                                section: "Connected Agents",
                             })));
                         }
                         catch (e) {
@@ -1973,34 +2256,34 @@ export function createAgentChatPlugin(options) {
                 setResponseStatus(event, 404);
                 return { error: "Not found" };
             }
-            // Set AGENT_USER_EMAIL so scripts resolve the same owner as the session.
-            // Without this, scripts default to "local@localhost" and miss resources
-            // created by users who authenticated via OAuth (e.g., Gmail).
+            // Resolve per-request auth context
             const owner = await getOwnerFromEvent(event);
-            process.env.AGENT_USER_EMAIL = owner;
-            // Set AGENT_ORG_ID so db-query/db-exec scope by org_id when applicable.
-            // Priority: explicit resolveOrgId callback > session.orgId from Better Auth
-            let resolvedOrgId = null;
+            // Resolve org ID: explicit callback > session.orgId from Better Auth
+            let resolvedOrgId;
             if (options?.resolveOrgId) {
-                resolvedOrgId = await options.resolveOrgId(event);
+                resolvedOrgId = (await options.resolveOrgId(event)) ?? undefined;
             }
             else {
                 try {
                     const session = await getSession(event);
-                    resolvedOrgId = session?.orgId ?? null;
+                    resolvedOrgId = session?.orgId ?? undefined;
                 }
                 catch {
                     // Session not available
                 }
             }
+            // Also set process.env for backwards compat (CLI scripts, legacy readers)
+            process.env.AGENT_USER_EMAIL = owner;
             if (resolvedOrgId) {
                 process.env.AGENT_ORG_ID = resolvedOrgId;
             }
             else {
                 delete process.env.AGENT_ORG_ID;
             }
-            const handler = currentDevMode && devHandler ? devHandler : prodHandler;
-            return handler(event);
+            return runWithRequestContext({ userEmail: owner, orgId: resolvedOrgId }, () => {
+                const handler = currentDevMode && devHandler ? devHandler : prodHandler;
+                return handler(event);
+            });
         }));
         // ─── Recurring Jobs Scheduler ──────────────────────────────────────
         // Poll every 60 seconds for due recurring jobs and execute them.
@@ -2012,6 +2295,7 @@ export function createAgentChatPlugin(options) {
                 getActions: () => ({
                     ...templateScripts,
                     ...resourceScripts,
+                    ...docsScripts,
                     ...chatScripts,
                     ...jobTools,
                 }),
@@ -2045,4 +2329,35 @@ export function createAgentChatPlugin(options) {
  * In production, provides only the default system prompt.
  */
 export const defaultAgentChatPlugin = createAgentChatPlugin();
+// ---------------------------------------------------------------------------
+// MCP client glue — a shared manager reference + a /_agent-native/mcp/status
+// route so onboarding / settings UIs can see which MCP servers are live.
+// ---------------------------------------------------------------------------
+let _globalMcpManager = null;
+function setGlobalMcpManager(manager) {
+    _globalMcpManager = manager;
+}
+/** Internal: access the current process's MCP client manager, if any. */
+export function getGlobalMcpManager() {
+    return _globalMcpManager;
+}
+function mountMcpStatusRoute(nitroApp, manager) {
+    // Idempotent — agent-chat-plugin can be invoked once per process; guard anyway.
+    if (globalThis.__agentNativeMcpStatusMounted)
+        return;
+    globalThis.__agentNativeMcpStatusMounted = true;
+    try {
+        getH3App(nitroApp).use("/_agent-native/mcp/status", defineEventHandler(async (event) => {
+            if (getMethod(event) !== "GET") {
+                setResponseStatus(event, 405);
+                return { error: "Method not allowed" };
+            }
+            setResponseHeader(event, "Content-Type", "application/json");
+            return manager.getStatus();
+        }));
+    }
+    catch (err) {
+        console.warn(`[mcp-client] Failed to mount /_agent-native/mcp/status: ${err?.message ?? err}`);
+    }
+}
 //# sourceMappingURL=agent-chat-plugin.js.map