@bahulam/code 0.1.10 → 0.1.12

package/src/core/system-prompt.mjs

@@ -1,8 +1,8 @@
 /**
- * System Prompt Builder — loads and merges CLAUDE.md and KEPLER.md files.
+ * System Prompt Builder — loads and merges CLAUDE.md and BAHULAM.md files.
  *
  * Features:
- * - Loads CLAUDE.md from: ~/.claude/CLAUDE.md, project root, parent dirs
+ * - Loads CLAUDE.md and BAHULAM.md from: global dir, project root, parent dirs
  * - Merges in order (global -> project -> local)
  * - Splits at cache boundary (static prefix cached, dynamic suffix not)
  * - Includes tool schemas in the system prompt
@@ -13,27 +13,46 @@ import os from 'os';
 import { loadBahulamMemory } from '../config/memory-loader.mjs';
 
 /**
- * Load all CLAUDE.md files and merge them in order.
+ * Load all instruction files and merge them in order (global → parent → project).
+ *
+ * Three first-class formats, per industry standard (2026):
+ *   AGENTS.md   — universal baseline: build rules, code style, monorepo layout.
+ *                 Loaded by 30+ agents (Cursor, Copilot CLI, Gemini CLI, Claude Code).
+ *   BAHULAM.md  — Bahulam-native persistent memory: tool directives, preferences,
+ *                 project-specific context that travels every session.
+ *   CLAUDE.md   — Claude Code / Claude-specific instructions and memory tiers.
+ *
+ * Search order per directory: AGENTS.md → BAHULAM.md → .bahulam/BAHULAM.md
+ *                                       → CLAUDE.md  → .claude/CLAUDE.md
+ *
  * @param {string} [cwd] - current working directory
- * @returns {string[]} Array of CLAUDE.md contents in merge order
+ * @returns {Array<{source,content,path}>} files in merge order
  */
 export function loadClaudeMdFiles(cwd = process.cwd()) {
     const files = [];
 
-    // 1. Global: ~/.claude/CLAUDE.md
-    const globalPath = path.join(os.homedir(), '.claude', 'CLAUDE.md');
-    if (fs.existsSync(globalPath)) {
-        try {
-            files.push({ source: 'global', content: fs.readFileSync(globalPath, 'utf-8') });
-        } catch { /* skip */ }
+    // 1. Global files
+    for (const globalPath of [
+        path.join(os.homedir(), '.bahulam', 'AGENTS.md'),
+        path.join(os.homedir(), '.bahulam', 'BAHULAM.md'),
+        path.join(os.homedir(), '.claude', 'CLAUDE.md'),
+    ]) {
+        if (fs.existsSync(globalPath)) {
+            try {
+                files.push({ source: 'global', content: fs.readFileSync(globalPath, 'utf-8'), path: globalPath });
+            } catch { /* skip */ }
+        }
     }
 
-    // 2. Walk from cwd up to root, collecting CLAUDE.md files
+    // 2. Walk from cwd up to root, collecting per-directory instruction files
     const projectFiles = [];
     let dir = path.resolve(cwd);
     const root = path.parse(dir).root;
     while (dir !== root) {
         const candidates = [
+            path.join(dir, 'AGENTS.md'),
+            path.join(dir, 'BAHULAM.md'),
+            path.join(dir, '.bahulam', 'BAHULAM.md'),
             path.join(dir, 'CLAUDE.md'),
             path.join(dir, '.claude', 'CLAUDE.md'),
         ];
@@ -47,7 +66,7 @@ export function loadClaudeMdFiles(cwd = process.cwd()) {
         dir = path.dirname(dir);
     }
 
-    // Reverse so parent dirs come first (global -> project -> local)
+    // Reverse so parent dirs come first (global → project → local)
     projectFiles.reverse();
     files.push(...projectFiles);
 

package/src/core/tool-executor.mjs

@@ -16,17 +16,22 @@ import { analyzeCode } from '../context/ast-parser.mjs';
 import { ProjectRegistry } from '../tools/project-overview.mjs';
 import { SkillInstaller } from '../skills/installer.mjs';
 import { SkillsLoader } from '../skills/loader.mjs';
-import { createAgentFile, listLocalAgents, syncAgentsToBackend } from '../agents/scaffold.mjs';
+import { agentToSpec, createAgentFile, listLocalAgents, syncAgentsToBackend } from '../agents/scaffold.mjs';
 import { createWorkflowFile, listLocalWorkflows, WORKFLOW_SYNC_ENDPOINT, slugifyWorkflowName } from '../agents/workflow_scaffold.mjs';
 import { BahulamAuth } from '../auth/bahulam-auth.mjs';
 import { detectImageFile } from './attachments.mjs';
 import { streamResponse } from './streaming.mjs';
 import { sendApprovalDecision, sendCallback } from './callback-client.mjs';
 import { HookRunner } from '../config/hook-runner.mjs';
+import { loadBahulamSettings } from '../config/settings-loader.mjs';
+import { BUILTIN_AGENTS } from '../terminal/agents.mjs';
 import { buildFileDiff } from './file-diff.mjs';
 import { buildWorkScope } from './work-scope.mjs';
 import { loadDiskMemory, ensureBahulamDir, globalMemoryPath, projectMemoryPath } from './memory-disk.mjs';
+import { backgroundTasks } from './background-tasks.mjs';
 import { resolveLintCommand } from './lint-resolver.mjs';
+import { PluginRegistry } from '../plugins/registry.mjs';
+import { loadPluginTool } from '../plugins/executor.mjs';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
@@ -48,6 +53,19 @@ export function createToolExecutor({
     interactionHandler = null,
     onAutoRegisterStart = null,
     onAutoRegisterDone = null,
+    pluginRegistry = null,
+    // Optional emit hook: called (debounced per key) after any plugin
+    // state write commits. Wired by the workspace server so writes turn
+    // into SSE `plugin_state_changed` events for live view updates.
+    // REPL/headless callers leave this null — state still works, just
+    // no reactive pulse.
+    stateEmit = null,
+    // Execution channel. 'main' (REPL/headless/CLI): plugin agents are
+    // workspace-scoped and excluded from listings and the agent-context
+    // envelope unless allowlisted in settings plugins.agent_allowlist.
+    // 'workspace' (plugin workspace sessions via agent-relay): the
+    // session plugin's agents are fully available.
+    channel = 'main',
 } = {}) {
     // Cross-session memory cache. Ships in getAgentContext() on every turn,
     // so we need it to be byte-identical when the underlying disk file hasn't
@@ -78,7 +96,7 @@ export function createToolExecutor({
         _memoryCache = { key, facts, digest };
         return _memoryCache;
     }
-    const occRegistry = createToolRegistry();
+    const occRegistry = createToolRegistry({ pluginRegistry, stateEmit });
     const skillTool = occRegistry.get('Skill');
     if (skillTool) skillTool._skillsLoader = skillsLoader;
     const installer = skillInstaller || new SkillInstaller({
@@ -146,7 +164,7 @@ export function createToolExecutor({
     }
 
     function longRunningObservationTimeoutMs() {
-        const configured = Number(process.env.KEPLER_LONG_RUNNING_TIMEOUT_MS);
+        const configured = Number(process.env.BAHULAM_LONG_RUNNING_TIMEOUT_MS);
         return Number.isFinite(configured) && configured > 0 ? configured : 15_000;
     }
 
@@ -243,17 +261,140 @@ export function createToolExecutor({
             source_scope: agent.source_scope || 'unknown',
             source: agent.source || '',
             content_hash: agent.content_hash || '',
+            runnable: agent.runnable !== false,
         };
     }
 
+    function pluginAgentToLocalShape(agentDef) {
+        const pluginName = agentDef._plugin_name
+            || String(agentDef.source || '').replace(/^plugin:/, '')
+            || 'unknown';
+        const source = `plugin:${pluginName}`;
+        const base = {
+            ...agentDef,
+            slug: agentDef.slug || agentDef.name || '',
+            name: agentDef.name || agentDef.slug || '',
+            description: agentDef.description || '',
+            role: agentDef.role || 'specialist',
+            model: agentDef.model || null,
+            models: agentDef.models || undefined,
+            tools: Array.isArray(agentDef.tools)
+                ? agentDef.tools
+                : (Array.isArray(agentDef.agent_tools) ? agentDef.agent_tools : []),
+            capabilities: Array.isArray(agentDef.capabilities) ? agentDef.capabilities : [],
+            domains: Array.isArray(agentDef.domains) ? agentDef.domains : [],
+            system_prompt: agentDef.system_prompt || agentDef.prompt || agentDef.instructions || '',
+            prompt: agentDef.prompt || agentDef.system_prompt || agentDef.instructions || '',
+            source_scope: 'plugin',
+            source,
+        };
+        const spec = {
+            ...agentToSpec(base),
+            source,
+            source_scope: 'plugin',
+            plugin_name: pluginName,
+        };
+        if (spec.config?.metadata && typeof spec.config.metadata === 'object') {
+            spec.config.metadata.source = source;
+            spec.config.metadata.source_scope = 'plugin';
+        }
+        const content = JSON.stringify(spec);
+        return {
+            ...base,
+            slug: spec.slug,
+            spec,
+            source,
+            source_scope: 'plugin',
+            content_hash: crypto.createHash('sha256').update(content).digest('hex'),
+        };
+    }
+
+    function listPluginAgents() {
+        if (!pluginRegistry) return [];
+        return pluginRegistry.listAgents()
+            .map(pluginAgentToLocalShape)
+            .filter(agent => agent.slug);
+    }
+
+    // Plugin agents are workspace-scoped entities. They enter the
+    // main-loop registry only via an explicit settings allowlist.
+    function pluginAgentAllowlist() {
+        try {
+            const { settings } = loadBahulamSettings({ cwd: process.cwd() });
+            const list = settings?.plugins?.agent_allowlist;
+            return Array.isArray(list) ? list.map(item => String(item)) : [];
+        } catch {
+            return [];
+        }
+    }
+
+    const BUILTIN_RUNNABLES = BUILTIN_AGENTS.map(def => ({
+        slug: def.command,
+        name: def.name,
+        description: def.description || '',
+        role: 'builtin',
+        model: null,
+        models: undefined,
+        tools: [],
+        capabilities: [],
+        domains: [],
+        source_scope: 'builtin',
+        source: 'builtin',
+        content_hash: '',
+        read_only: Boolean(def.readOnly),
+        runnable: true,
+    }));
+
+    // The deterministic sub-agent registry. Resolution precedence:
+    // project agent → global agent → builtin → allowlisted plugin agent.
+    // In workspace-channel executors the session plugin's agents are
+    // runnable without an allowlist entry.
+    function listRunnables() {
+        const bySlug = new Map();
+        for (const agent of listLocalAgents(process.cwd())) {
+            if (agent.slug && !bySlug.has(agent.slug)) {
+                bySlug.set(agent.slug, { ...agent, runnable: true });
+            }
+        }
+        for (const builtin of BUILTIN_RUNNABLES) {
+            if (!bySlug.has(builtin.slug)) bySlug.set(builtin.slug, builtin);
+        }
+        const allowlist = new Set(pluginAgentAllowlist());
+        for (const agent of listPluginAgents()) {
+            if (!agent.slug || bySlug.has(agent.slug)) continue;
+            if (channel === 'workspace' || allowlist.has(agent.slug)) {
+                bySlug.set(agent.slug, { ...agent, runnable: true });
+            }
+        }
+        return [...bySlug.values()];
+    }
+
+    // Installed plugin agents NOT admitted to the main-loop registry —
+    // still discoverable (scope:'plugin') but flagged not runnable.
+    function listWorkspaceScopedPluginAgents() {
+        const runnableSlugs = new Set(listRunnables().map(agent => agent.slug));
+        return listPluginAgents()
+            .filter(agent => agent.slug && !runnableSlugs.has(agent.slug))
+            .map(agent => ({ ...agent, runnable: false }));
+    }
+
+    // Agent-context envelope population: the runnable registry minus
+    // builtins (the backend has its own delegation vocabulary for those;
+    // adding them to available_agents would change wire behavior).
+    function listAvailableAgents() {
+        return listRunnables().filter(agent => agent.source_scope !== 'builtin');
+    }
+
     function filterLocalAgents(args = {}) {
         const scope = String(args.scope || '').trim();
-        if (scope && scope !== 'project' && scope !== 'global') {
-            throw new Error('scope must be "project" or "global"');
+        if (scope && !['project', 'global', 'plugin', 'builtin'].includes(scope)) {
+            throw new Error('scope must be "project", "global", "plugin", or "builtin"');
         }
-        return listLocalAgents(process.cwd())
-            .filter(agent => !scope || agent.source_scope === scope)
-            .filter(agent => agentMatches(agent, args.query || args.name || ''));
+        const pool = scope === 'plugin'
+            ? [...listRunnables(), ...listWorkspaceScopedPluginAgents()]
+            : listRunnables();
+        const combined = pool.filter(agent => !scope || agent.source_scope === scope);
+        return combined.filter(agent => agentMatches(agent, args.query || args.name || ''));
     }
 
     function selectAgentsForSync(args = {}) {
@@ -618,11 +759,197 @@ export function createToolExecutor({
         return { output: lines.join('\n'), files, directories, truncated };
     }
 
+    // ── Plugin tool map ──────────────────────────────────────────
+    // Plugin tools are registered here alongside the built-in toolMap.
+    // They are dispatched with lower priority (built-in tools win on name collision).
+    const pluginToolMap = new Map(); // name → async handler function
+
+    function registerPluginTool(name, handler, metadata = {}) {
+        if (pluginToolMap.has(name)) {
+            if (process.env.DEBUG) {
+                console.warn(`Plugin tool "${name}" already registered from another plugin — skipping.`);
+            }
+            return false;
+        }
+        handler._pluginTool = metadata;
+        pluginToolMap.set(name, handler);
+        return true;
+    }
+
+    // Per-plugin state handles are opened lazily on first tool call and
+    // cached process-wide. `makePluginState` itself dedupes on plugin
+    // name, so this Map only exists to avoid re-attaching stateEmit on
+    // every registered tool.
+    const _pluginStateHandles = new Map(); // pluginName -> state proxy
+    async function _pluginStateFor(pluginName) {
+        if (!pluginName) return null;
+        if (_pluginStateHandles.has(pluginName)) return _pluginStateHandles.get(pluginName);
+        const { makePluginState } = await import('../plugins/state.mjs');
+        const state = makePluginState(pluginName, { emit: stateEmit });
+        _pluginStateHandles.set(pluginName, state);
+        return state;
+    }
+
+    /**
+     * Register one MCP tool under `<serverName>.<toolName>` (namespaced
+     * to prevent collisions between plugins that ship servers with the
+     * same tool name). The MCP client is owned by the caller (agent-
+     * relay) which spawns/tears it down with the workspace lifetime.
+     * Handler receives the same options shape as JS plugin tools so
+     * `state`, `signal`, `pluginName` all work uniformly.
+     */
+    function registerMcpTool(pluginName, serverName, toolName, mcpClient, toolSchema = {}) {
+        const qualified = `${serverName}.${toolName}`;
+        if (toolMap[qualified] || pluginToolMap.has(qualified)) {
+            if (process.env.DEBUG) {
+                console.warn(`MCP tool "${qualified}" from plugin "${pluginName}" collides with an existing tool — skipping.`);
+            }
+            return false;
+        }
+        const mcpHandler = async (args, options = {}) => {
+            // The lazy-state getter matches JS plugin tools so an MCP
+            // "wrapper" tool can trivially write its result to the same
+            // Shared Blackboard (rare, but useful for cache-and-return).
+            const handlerOpts = {
+                ...options,
+                pluginName,
+                mcpServer: serverName,
+                get state() {
+                    if (this._stateP) return this._stateP;
+                    this._stateP = _pluginStateFor(pluginName);
+                    return this._stateP;
+                },
+            };
+            try {
+                const result = await mcpClient.callTool(toolName, args || {});
+                // callTool returns joined text for text/* content; pass through as output.
+                const output = typeof result === 'string' ? result : (result?.output ?? result);
+                // Allow the caller (state-writer wrapper) to introspect via handlerOpts.
+                void handlerOpts;
+                return { success: true, output, _tool: qualified, _plugin: pluginName, _mcp_server: serverName };
+            } catch (err) {
+                return {
+                    success: false,
+                    output: `MCP tool error (${qualified}): ${err.message}`,
+                    _tool: qualified,
+                    _plugin: pluginName,
+                    _mcp_server: serverName,
+                };
+            }
+        };
+        mcpHandler._pluginTool = { pluginName, source: 'mcp', serverName, toolName };
+        pluginToolMap.set(qualified, mcpHandler);
+        // Track schema for tool-listing surfaces (also help /tools discovery).
+        pluginToolMap.get(qualified)._mcp = { pluginName, serverName, toolName, schema: toolSchema };
+        return true;
+    }
+
+    function registerPluginToolsFromRegistry() {
+        if (!pluginRegistry) return;
+        for (const toolDef of pluginRegistry.listTools?.() || []) {
+            const name = String(toolDef.name || '').trim();
+            if (!name || toolMap[name]) continue;
+            const pluginName = toolDef._plugin_name || toolDef.plugin_name || null;
+            registerPluginTool(name, async (args, options = {}) => {
+                const handler = await loadPluginTool(toolDef._plugin_dir, toolDef.tool);
+                if (!handler) {
+                    return {
+                        success: false,
+                        output: `Plugin tool module could not be loaded: ${name}`,
+                        _tool: name,
+                        _plugin: pluginName,
+                    };
+                }
+                // Shared-blackboard injection: handlers opt in by naming
+                // `state` in their signature (`async call(args, { state })`).
+                // The property is a getter so the SQLite file is only
+                // opened when a handler actually asks for it — plugins
+                // that never touch state pay zero disk / init cost.
+                const handlerOpts = {
+                    ...options,
+                    pluginName,
+                    get state() { /* eslint-disable no-unused-vars */
+                        // Sync getter fronting an async loader — first
+                        // access returns a Promise, which is unusual
+                        // for handler code but common enough as
+                        // `const s = await opts.state`. The awaited
+                        // value is cached on this options object so
+                        // repeat accesses in the same call don't re-await.
+                        if (this._stateP) return this._stateP;
+                        this._stateP = _pluginStateFor(pluginName);
+                        return this._stateP;
+                    },
+                };
+                try {
+                    const result = await handler.call(args || {}, handlerOpts);
+                    if (result && typeof result === 'object' && 'success' in result) {
+                        return { ...result, _tool: name, _plugin: pluginName };
+                    }
+                    return {
+                        success: true,
+                        output: typeof result === 'string' ? result : JSON.stringify(result),
+                        _tool: name,
+                        _plugin: pluginName,
+                    };
+                } catch (err) {
+                    return {
+                        success: false,
+                        output: `Plugin tool error (${name}): ${err.message}`,
+                        _tool: name,
+                        _plugin: pluginName,
+                    };
+                }
+            }, { pluginName, source: 'plugin' });
+        }
+    }
+
+    function pluginAgentForTool(toolName, pluginName) {
+        if (!pluginRegistry) return null;
+        return (pluginRegistry.listAgents?.() || []).find(agent => {
+            const agentPlugin = agent._plugin_name
+                || String(agent.source || '').replace(/^plugin:/, '')
+                || null;
+            if (pluginName && agentPlugin && agentPlugin !== pluginName) return false;
+            return Array.isArray(agent.tools) && agent.tools.includes(toolName);
+        }) || null;
+    }
+
+    function primaryModelPluginToolBlock(name, handler, options = {}) {
+        if (!handler?._pluginTool) return null;
+        if (options.toolCallSource !== 'model') return null;
+        if (options.internal || options.subAgent || options.allowPrimaryPluginToolCall) return null;
+
+        const pluginName = handler._pluginTool.pluginName || 'plugin';
+        // Tools-only plugins have no delegation owner: with no agent to
+        // route through, the primary agent uses the tools directly (the
+        // user consented by enabling the plugin). The delegate-only rule
+        // applies only when the plugin ships an owning agent.
+        const pluginShipsAgents = (pluginRegistry?.listAgents?.() || [])
+            .some(agent => (agent._plugin_name || '') === pluginName);
+        if (!pluginShipsAgents) return null;
+
+        const agent = pluginAgentForTool(name, pluginName);
+        const delegateHint = agent?.slug
+            ? `Delegate to the '${agent.slug}' sub-agent instead, or run it explicitly with /run ${agent.slug} "...".`
+            : `Delegate to the plugin's sub-agent instead, or run the plugin agent explicitly.`;
+        return {
+            success: false,
+            output: `Plugin tool '${name}' is scoped to plugin '${pluginName}' and should not be called directly by the primary agent. ${delegateHint}`,
+            _tool: name,
+            _plugin: pluginName,
+            _blocked: true,
+            _requires_agent_delegation: true,
+            _agent: agent?.slug || null,
+        };
+    }
+
     async function executeToolWithHooks(name, args, options = {}) {
-        const handler = toolMap[name];
+        const handler = toolMap[name] || pluginToolMap.get(name);
         if (!handler) {
             return { success: false, output: `Unknown tool: ${name}`, _tool: name };
         }
+        const pluginToolBlock = primaryModelPluginToolBlock(name, handler, options);
+        if (pluginToolBlock) return pluginToolBlock;
         const hooks = hookRunner || new HookRunner({ cwd: process.cwd() });
         try {
             throwIfAborted(options.signal);
@@ -976,6 +1303,30 @@ export function createToolExecutor({
             args._classification = classification.classification; // 'safe' or 'contained'
             const cwd = await commandCwd(args);
 
+            // Background execution: start via the BackgroundTasks registry
+            // and return immediately. Safety checks above still apply;
+            // results are retrieved with job_output / killed with job_kill.
+            if (args.run_in_background) {
+                const job = backgroundTasks.start({
+                    command: args.command,
+                    cwd,
+                    timeoutMs: args.timeout ? Math.min(Number(args.timeout), 3_600_000) : undefined,
+                    // Deterministic wake-on-finish: completion dispatches the
+                    // named agent through the trigger funnel (chain-guarded).
+                    on_complete: args.on_complete_agent ? {
+                        target: `agent:${String(args.on_complete_agent).trim()}`,
+                        instruction: args.on_complete_instruction || null,
+                    } : null,
+                });
+                return {
+                    success: true,
+                    output: `Background job started: ${job.id} (pid ${job.pid}). `
+                        + `Check progress with job_output {"job_id": "${job.id}"}; stop with job_kill.`,
+                    job_id: job.id,
+                    _tool: 'shell',
+                };
+            }
+
             // Pre-check: if command is rm/unlink, verify targets exist first
             const rmMatch = (args.command || '').match(/^rm\s+(?:-\w+\s+)*(.+)$/);
             if (rmMatch) {
@@ -1906,9 +2257,47 @@ export function createToolExecutor({
         },
 
         // User-defined agents — metadata first, project YAML + backend sync on demand.
+        job_output: async (args = {}) => {
+            const jobId = String(args.job_id || '').trim();
+            if (!jobId) {
+                const jobs = backgroundTasks.list();
+                return {
+                    success: true,
+                    output: jobs.length
+                        ? JSON.stringify({ jobs }, null, 2)
+                        : 'No background jobs in this session.',
+                    jobs,
+                    _tool: 'job_output',
+                };
+            }
+            const job = args.block
+                ? await backgroundTasks.wait(jobId)
+                : backgroundTasks.describe(jobId);
+            if (!job) return { success: false, output: `Unknown job: ${jobId}`, _tool: 'job_output' };
+            const tailLines = Number(args.tail_lines) || 80;
+            const tail = String(job.tail || '').split('\n').slice(-tailLines).join('\n');
+            return {
+                success: true,
+                output: `${job.id} · ${job.status}`
+                    + (job.exit_code != null ? ` (exit ${job.exit_code})` : '')
+                    + ` · ${job.duration_s}s\n${tail}`,
+                job: { ...job, tail: undefined },
+                _tool: 'job_output',
+            };
+        },
+
+        job_kill: async (args = {}) => {
+            const job = backgroundTasks.kill(String(args.job_id || '').trim());
+            if (!job) return { success: false, output: `Unknown job: ${args.job_id}`, _tool: 'job_kill' };
+            return { success: true, output: `${job.id} → ${job.status}`, job, _tool: 'job_kill' };
+        },
+
         agents_list: async (args = {}) => {
             const agents = filterLocalAgents(args).map(compactAgentMetadata);
             const payload = { agents, count: agents.length };
+            if (agents.some(agent => agent.runnable === false)) {
+                payload.note = 'Agents with runnable:false are workspace-scoped plugin agents; add their slug to settings plugins.agent_allowlist to invoke them from the main loop.';
+            }
             return {
                 success: true,
                 output: JSON.stringify(payload, null, 2),
@@ -1939,7 +2328,8 @@ export function createToolExecutor({
                     : null,
                 next_actions: [
                     `Edit ${result.filePath}`,
-                    `Run /agents sync ${result.slug} when ready`,
+                    `Run /run ${result.slug} "<task>" or delegate to it from chat immediately`,
+                    `Optional: /agents sync ${result.slug} to publish it to the backend for account/cloud reuse`,
                 ],
             };
             return {
@@ -2293,6 +2683,8 @@ export function createToolExecutor({
         },
     };
 
+    registerPluginToolsFromRegistry();
+
     return {
         /**
          * Execute a Bahulam tool by name.
@@ -2306,7 +2698,33 @@ export function createToolExecutor({
 
         /** List all available tool names. */
         listTools() {
-            return Object.keys(toolMap);
+            return [...Object.keys(toolMap), ...pluginToolMap.keys()];
+        },
+
+        /**
+         * Register one MCP-backed tool as `<serverName>.<toolName>`.
+         * Called by the workspace lifecycle after spawning per-plugin
+         * MCP clients. Returns true on success, false on name collision.
+         */
+        registerMcpTool(pluginName, serverName, toolName, mcpClient, toolSchema) {
+            return registerMcpTool(pluginName, serverName, toolName, mcpClient, toolSchema);
+        },
+
+        /**
+         * Unregister every MCP tool sourced from one server, called on
+         * plugin teardown / workspace close so subsequent sessions don't
+         * see stale `serverName.tool` entries.
+         */
+        unregisterMcpServer(pluginName, serverName) {
+            let removed = 0;
+            for (const [key, fn] of pluginToolMap) {
+                const meta = fn?._mcp;
+                if (meta && meta.pluginName === pluginName && meta.serverName === serverName) {
+                    pluginToolMap.delete(key);
+                    removed++;
+                }
+            }
+            return removed;
         },
 
         getProjectResources() {
@@ -2340,6 +2758,21 @@ export function createToolExecutor({
             return results;
         },
 
+        listRunnables,
+
+        // Plugin tool schemas (name/description/input_schema) for callers
+        // that compose model-facing tool lists — e.g. the graph engine's
+        // direct substrate giving a plugin agent its declared tools.
+        listPluginToolSchemas() {
+            if (!pluginRegistry) return [];
+            return (pluginRegistry.listTools?.() || []).map(tool => ({
+                name: tool.name,
+                description: tool.description || '',
+                input_schema: tool.input_schema || { type: 'object', properties: {} },
+                plugin_name: tool._plugin_name || tool.plugin_name || null,
+            })).filter(tool => tool.name);
+        },
+
         getAgentContext() {
             const global = projectRegistry.getGlobalContext();
             const mem = _readMemorySnapshot();
@@ -2355,7 +2788,7 @@ export function createToolExecutor({
                 // hasn't changed between turns.
                 memory_facts: mem.facts,
                 memory_digest: mem.digest,
-                available_agents: listLocalAgents(process.cwd()).map(agent => ({
+                available_agents: listAvailableAgents().map(agent => ({
                     slug: agent.slug,
                     name: agent.name,
                     description: agent.description,
@@ -2366,8 +2799,20 @@ export function createToolExecutor({
                     capabilities: agent.capabilities,
                     domains: agent.domains,
                     source_scope: agent.source_scope,
+                    source: agent.source,
                     spec: agent.spec,
                 })),
+                // Background jobs the model should know about. Stable fields
+                // only (no durations) so the entry — and the prompt cache —
+                // changes on status transitions, not every turn.
+                ...(backgroundTasks.list().length ? {
+                    background_jobs: backgroundTasks.list().map(job => ({
+                        id: job.id,
+                        name: job.name,
+                        status: job.status,
+                        exit_code: job.exit_code,
+                    })),
+                } : {}),
                 available_workflows: listLocalWorkflows(process.cwd()).map(workflow => ({
                     slug: workflow.slug,
                     name: workflow.name,