@bahulam/code 0.1.11 → 0.1.13

package/src/core/tool-executor.mjs

@@ -23,9 +23,12 @@ 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';
@@ -57,6 +60,12 @@ export function createToolExecutor({
     // 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
@@ -87,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({
@@ -252,6 +261,7 @@ export function createToolExecutor({
             source_scope: agent.source_scope || 'unknown',
             source: agent.source || '',
             content_hash: agent.content_hash || '',
+            runnable: agent.runnable !== false,
         };
     }
 
@@ -306,24 +316,84 @@ export function createToolExecutor({
             .filter(agent => agent.slug);
     }
 
-    function listAvailableAgents() {
+    // 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);
+            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)) bySlug.set(agent.slug, agent);
+            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 && !['project', 'global', 'plugin'].includes(scope)) {
-            throw new Error('scope must be "project", "global", or "plugin"');
+        if (scope && !['project', 'global', 'plugin', 'builtin'].includes(scope)) {
+            throw new Error('scope must be "project", "global", "plugin", or "builtin"');
         }
-        const combined = listAvailableAgents()
-            .filter(agent => !scope || agent.source_scope === scope);
+        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 || ''));
     }
 
@@ -694,13 +764,14 @@ export function createToolExecutor({
     // 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) {
+    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;
     }
@@ -735,7 +806,7 @@ export function createToolExecutor({
             }
             return false;
         }
-        pluginToolMap.set(qualified, async (args, options = {}) => {
+        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).
@@ -765,7 +836,9 @@ export function createToolExecutor({
                     _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;
@@ -777,12 +850,59 @@ export function createToolExecutor({
             const name = String(toolDef.name || '').trim();
             if (!name || toolMap[name]) continue;
             const pluginName = toolDef._plugin_name || toolDef.plugin_name || null;
+            if (toolDef._composed?.kind === 'pi') {
+                // Composed pi tools resolve at invocation time: look up the
+                // installed pi package's directory, load the specific handler
+                // via the shim-backed probe, invoke, return the result. Handler
+                // cache is per-session (per tool name) to amortize the ~50ms
+                // child-process overhead on repeat calls.
+                let _piInvokeP = null;
+                registerPluginTool(name, async (args, options = {}) => {
+                    try {
+                        if (!_piInvokeP) {
+                            const { loadPiToolHandler } = await import('../plugins/pi-compat/probe.mjs');
+                            const packageName = toolDef._composed.package_name;
+                            const originalName = toolDef._composed.original_name;
+                            const { bahulamHome } = await import('./paths.mjs');
+                            const piBaseDir = path.join(bahulamHome(), 'plugins-pi');
+                            const piDir = path.join(piBaseDir, packageName.replace(/[/@]/g, '_'));
+                            if (!fs.existsSync(piDir)) {
+                                return {
+                                    success: false,
+                                    output: `Composed pi tool '${name}' unavailable: pi package ${packageName} is not installed. Run \`bahulam plugin install pi:${packageName}\`.`,
+                                    _tool: name,
+                                    _plugin: pluginName,
+                                    _composed: toolDef._composed,
+                                };
+                            }
+                            _piInvokeP = loadPiToolHandler(piDir, originalName, { pluginName: packageName });
+                        }
+                        const invoke = await _piInvokeP;
+                        const result = await invoke(args || {});
+                        return {
+                            ...(result && typeof result === 'object' ? result : { success: true, output: String(result) }),
+                            _tool: name,
+                            _plugin: pluginName,
+                            _composed: toolDef._composed,
+                        };
+                    } catch (err) {
+                        return {
+                            success: false,
+                            output: `Composed pi tool '${name}' failed: ${err.message}`,
+                            _tool: name,
+                            _plugin: pluginName,
+                            _composed: toolDef._composed,
+                        };
+                    }
+                }, { pluginName, source: 'pi', composed: toolDef._composed });
+                continue;
+            }
             registerPluginTool(name, async (args, options = {}) => {
-                const handler = await loadPluginTool(toolDef._plugin_dir, toolDef.handler);
+                const handler = await loadPluginTool(toolDef._plugin_dir, toolDef.tool);
                 if (!handler) {
                     return {
                         success: false,
-                        output: `Plugin tool handler could not be loaded: ${name}`,
+                        output: `Plugin tool module could not be loaded: ${name}`,
                         _tool: name,
                         _plugin: pluginName,
                     };
@@ -826,15 +946,57 @@ export function createToolExecutor({
                         _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] || 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);
@@ -1188,6 +1350,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) {
@@ -2118,9 +2304,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),
@@ -2151,7 +2375,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 {
@@ -2580,6 +2805,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();
@@ -2609,6 +2849,17 @@ export function createToolExecutor({
                     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,

package/src/local-service/agent-relay.mjs

@@ -617,7 +617,7 @@ export class LocalAgentRelay {
       try { this.emit('plugin_state_changed', evt); }
       catch { /* never let SSE failure break a tool call */ }
     };
-    const toolExecutor = createToolExecutor({ pluginRegistry, stateEmit });
+    const toolExecutor = createToolExecutor({ pluginRegistry, stateEmit, channel: 'workspace' });
     await toolExecutor.waitForAutoRegister?.();
     await toolExecutor.registerProjectRoots?.([this.session.root_path], { forceRefresh: false });